diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-06-14 16:53:36 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-06-14 16:53:36 +1000 |
| commit | 81e615f6c645cb39359a9a7e40177682c299e597 (patch) | |
| tree | 3eecca538a8753d12953f9a7a1d32f398940c9e9 | |
| parent | 1d0085801fa0e720b7e9b1fa87d72946983950f4 (diff) | |
| download | linux-81e615f6c645cb39359a9a7e40177682c299e597.tar.gz linux-81e615f6c645cb39359a9a7e40177682c299e597.tar.xz | |
Add linux-next specific files for 20160614next-20160614
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 235 | ||||
| -rw-r--r-- | Next/Trees | 237 | ||||
| -rw-r--r-- | Next/merge.log | 5200 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5677 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e3c2df84ccaa --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,235 @@ +Name SHA1 +---- ---- +origin 5edb56491d4812c42175980759da53388e5d86f5 +fixes 5edb56491d4812c42175980759da53388e5d86f5 +kbuild-current b36fad65d61fffe4b662d4bfb1ed673c455a36a2 +arc-current 5edb56491d4812c42175980759da53388e5d86f5 +arm-current 56530f5d2ddc9b9fade7ef8db9cb886e9dc689b5 +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes 3b6d1eb7ea65f4aa64115cf9ba02c190e5c9f6de +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 6b15d6650c5301ce023d8df0cc3a60b1a76d377e +net d941ebe88a411aa281cc80477a93feb931a1b50b +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs 50219538ffc0493a2b451a3aa0191138ef8bfe9d +wireless-drivers 182fd9eecb287e696c82b30d06c6150d80a49c5b +mac80211 3d5fdff46c4b2b9534fa2f9fc78e90a48e0ff724 +sound-current 35639a0e98391036a4c7f23253c321d6621a8897 +pci-current 96381c04ef9b0c76e2e368e8f07846a1aa6ae7b6 +driver-core.current 5edb56491d4812c42175980759da53388e5d86f5 +tty.current 5edb56491d4812c42175980759da53388e5d86f5 +usb.current e4600d56323ed119469fdcb21564f7544e1e6b3c +usb-gadget-fixes 50c763f8c1bac0dc00f7788a75f227276c0efd54 +usb-serial-fixes af8c34ce6ae32addda3788d54a7e340cad22516b +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current a9cc4006155a68dd0940728f4f222dd035180904 +char-misc.current 69f1804a9ab602701217a8c23d371f8f36f8b57a +input-current 540c26087bfbad6ea72758b76b16ae6282a73fea +crypto-current 19ced623db2fe91604d69f7d86b03144c5107739 +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes ce7585f3c4d76bca1dff4b66ae1ea32552954f9e +kselftest-fixes 1a77e2bd8c89a37703dc9de18a7b552ad76e1c12 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 356d27bbfe332de0f2f78e55636e581960c9774e +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 5edb56491d4812c42175980759da53388e5d86f5 +arm c524c9d378f86e40358829e091e8f5806f61817d +arm-perf 4ba2578fa7b557012b8f59ad7a9284ff15394338 +arm-soc 813f80af1dc9d56d6b6810c17f561b76013faacb +amlogic 7493d8a4a133790d049f80c572cf5b3ac869a276 +at91 5a0d7c6a48ae60c41304858c6e885e3daeb8a083 +bcm2835 c40921768f5f20ba0a108dea7adae3676842dbdd +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 12f06592e8f6791dbe5d797386ccf25f8eec6f36 +keystone 4ae152393ae07e509b3183f2f7f6925b79978699 +mvebu 01316cded75be7e2ec0976179e027a3cc8c61a08 +omap f823934678b51fb1b6268e9d1ded2ac24454ccff +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 275804c07f4119d4a121ea497f022a40e434a266 +renesas 27b5fd3a193bd64734104ef92a824d376285de6d +rockchip 5e46e8d66d01057fd62ff94490d33b53c6514f14 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk a0c8f253cf3e277e16c0f570e3502e2e970c29c3 +tegra f59273b16284e82bac2a98c313da9149b52b2e40 +arm64 e6d9a52543338603e25e71e0e4942f05dae0dd8a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 787ca32dc704bde981760de01a3a7e6ce9835fdb +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu 5edb56491d4812c42175980759da53388e5d86f5 +metag 592ddeeff8cb0ba7ae11dbd08f583280bd15f865 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 847e858f3d0eb4c3c29c046dc6aa82d3334a0917 +nios2 9fa78f63a8921ce37252be34ef8eea2f4bfbb13f +parisc-hd 5975b2c0c10adbc7894a54ab7b30db4fbcdd8c41 +powerpc 138a076496e61c68ebc1dcccc088705826bbe26d +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 86d18a55dd66aea8bb8fffb0334557eb4973ea52 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 9fbd49cff0f02e122459fe4899ff0c136cdebcd2 +uml a78ff1112263fdd871d3506dbcff44f6f12e8423 +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs c315ef8d9db7f1a0ebd023a395ebdfde1c68057e +btrfs-kdave c717a308f3971bbb461f0c2eee47fe794a54cfaa +ceph f6973c09490c919398fc87d9c6bec9c0b670c4c4 +cifs 3bdc426e2497fb98a1051fc69f6c1709c00e377c +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 b9d8905e4a751e2cdc0fb474856b7183c594dcc6 +ext4 12735f881952c32b31bc4e433768f18489f79ec9 +f2fs fb88de96bd8916e6bb656cd583dcaef6bb096374 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 4441f63ab7e581ae460c9f7e06fba8a2be192e81 +gfs2 36e4ad0316c017d5b271378ed9a1c9a4b77fab5f +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs af8c34ce6ae32addda3788d54a7e340cad22516b +nfsd 9e62f931dd079ebbdde152d2c90a2fa9f67fb286 +orangefs 2dcd0af568b0cf583645c8a317dd12e344b1c72a +overlayfs 6510690149a9e9259a63234131dffed109e7220c +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 1112018cefc586cba924770a2b28bff6d2f0aa5c +xfs 26f1fe858f2744edfc75e92d34a6be0af5e8b45d +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 1eb82bc8e71279eea0cc6a9c9d591d8f706c4206 +pci af8c34ce6ae32addda3788d54a7e340cad22516b +pstore cae7316708c45e4cfdc586c2e0a02eaea398e246 +hid 9037766900ffa4d6192e7bf598768d60e43c6396 +i2c 33c77abcf4aa5e9679f702a2f979d44a470f6e6e +jdelvare-hwmon 18c358ac5e32ad43e9a50b4e5f344a896b9d1dad +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging 6bd8de90309e6a9139781ad116d03766e65e783b +v4l-dvb be77ec684f3d02127c1ca26f41963d83eaecb806 +pm a42dcdb2922fa8a9bd9a97638df32dba55e83c7c +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal 546afd1a3678829f0904a91bc14a09964e04ca19 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 916a890eaff2f13414ac738fca95c5a66a8c7e92 +net-next 99860208bc62d8ebd5c57495b84856506fe075bc +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 625b44fc15f829bf63a9aea8d62ec267c904b0a1 +wireless-drivers-next d02fb8f14b2d1779870744ff0ab435141491bf5f +bluetooth e69f73bfecb0178ae6bd20eb778211739cd71fab +mac80211-next e69f73bfecb0178ae6bd20eb778211739cd71fab +rdma 61c78eea9516a921799c17b4c20558e2aa780fd3 +rdma-leon 5edb56491d4812c42175980759da53388e5d86f5 +rdma-leon-test db6066bcf46500692fbec448d92f3361defe6f03 +mtd becc7ae544c61395b5eba7b9913e14aa567ca07a +l2-mtd 95193796256cfce16e5d881318e15b6b04062c15 +nand e2442baf99bc400e8141a6f5cebe993282d44549 +crypto e434cd2dc4de344a45b868679cad774d6b802018 +drm 3c85f20a289d044f303f473ee6ab7502303fc3b0 +drm-panel f103b93d90c287e3680929b1852b36919cca3b37 +drm-intel beffa5176fa26494039f9f83e445362494ebe908 +drm-tegra 057eab2013ecbba2e772293acc177e2e3210f05d +drm-misc c02726ffea2df09acc46adb049a7fb4ea10f0e05 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd f6c68b4bd4a98033d1e79479212bbd376e145728 +sunxi ac17bf0c25e37ef23d22a99e1c3df5706bdf3fee +kbuild 3f306a53b5714582749ed8c2dc71d51180ee6b5c +kspp 445701384575fbef1f477ffac9e866e6954fe9a7 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap 65a003e5c0c9e26d1b7245d9e153c20448df0c16 +sound 43aa56d95d2c3f141d516c78a654a33d1f287839 +sound-asoc 4c195b15cd98167fec74a8e521f49fd60d066112 +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input 1afca2b66aac7ac262d3511c68725e9e7053b40f +block 6f785ee3645f529959b030a71de87f2a3ce541ab +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper e83068a5faafb8ca65d3b58bd1e1e3959ce1ddce +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh b281733437037559aec39be0c0699b044571bddf +md d787be4092e27728cb4c012bee9762098ef3c662 +mfd b52207ef4ea56f8c22288ec3387399aac72c26cf +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery d04b674e188756c8e90a1cf422fe12ab1f147e4e +omap_dss2 ab366b40b8513e7590858229ecbb5e1434a52b54 +regulator d86007e58274aadcab4435ab42577cc9ca815197 +security 40d273782ff16fe1a7445cc05c66a447dfea3433 +integrity 05d1a717ec0430c916a749b94eb90ab74bbfa356 +keys 75aeddd12f205d07b36ed76db3426e974b8f2a21 +selinux 50b8629a606b876e2df000699d68904f239dcfeb +tpmdd e8f2f45a4402deb715220b750d892f7a70b0f868 +watchdog 1a695a905c18548062509178b98bc91e67510864 +iommu 6c0b43df74f900e7f31a49d1844f166df0f8afc6 +dwmw2-iommu 2566278551d3db875bc3bbfc41b42f2e80392108 +vfio f70552809419cd2abc0cc6469a07c9792a3aaa6c +jc_docs 8569de68e79e94cce6709831edd94accb6942ade +trivial 52bbe141f37f093e2c612e97c40d27422e5a1fdf +audit 2b4c7afe79a8a0a0e05edeaded5653c190153f9b +devicetree 06dfeef88573cf032e5c27e37f80ff5237b3318a +mailbox 9ef3c5112139cc5c5666ee096e05bc1e00e94015 +spi 50fdfdf1300cbe457be4df987afe085c1174dc07 +tip b2fcfd7a804616163f35782275594f1694ae0098 +clockevents 52be039599e1339ec4ea500337eb5d1655cb263e +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd ab564cb51ee60e845f65998491a703adbae52305 +irqchip ebf63bb87f67fbb656eea7c25190fcc7630cf267 +ftrace 97f8827a8c7963756ae7d3ee898675b4667eca73 +rcu b8ec0e6dbecf0ba82466872f5f841f0af088fc40 +kvm dca4d728773a2f48e999c8617524bbf8dee4807f +kvm-arm 35a2d58588f0992627e74b447ccab21570544c86 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b1a4286b8f3393857a205ec89607683161b75f90 +kvms390 a7e19ab55ffdd82f1a8d12694b9a0c0beeef534c +xen-tip bdadcaf2a7c19d667c7c021da2ffc8fa18c44031 +percpu 6710e594f71ccaad8101bc64321152af7cd9ea28 +workqueues f1e89a8f335824eeb720701e17fdc933a40fa605 +drivers-x86 b740d2e9233cb33626d3b62210bcfc6a34baa839 +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 3c13ab1d96e1924ef73b1a20c1ccccc993b6fb58 +leds 818b02a6f6897cc9a90f13f679efc981766b9c42 +ipmi 4e80ad011c9cc10fcaa0de6ba73ea5abe4b3c55d +driver-core 5edb56491d4812c42175980759da53388e5d86f5 +tty 5edb56491d4812c42175980759da53388e5d86f5 +usb 76d15c8fba655c9b2d60cf01834858f2c44483dc +usb-gadget 2a58f9c12bb360f38fb39e470bb5ff94014356e6 +usb-serial af8c34ce6ae32addda3788d54a7e340cad22516b +usb-chipidea-next 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b +staging 21ca52bb749e66cf755a8b8d6345a8fbbc17ce91 +char-misc c0ff9019ee64101fda8f19338da799fda8217e14 +extcon 4239b7f76be31d6c2a76dff363ec8dd6b5d63398 +cgroup 332d8a2fd14127e82b061744ad2a7a8e877e3857 +scsi 4d8e355acc29d983cff7ab4d4fe890257e8a2a6a +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata 5219d6530ef0bca37bd8c4c637908638ce205ff9 +pinctrl fe9f516997c6932cd68b64cd22e8ca14ccf62422 +vhost 139ab4d4e68b8cf2a611b06c006a2195dc6bedf1 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg a13c8bdda15eed019a6973e45b0cf3c574ef8d44 +gpio 32d92ac3d9362116d9257a939e9a040ac4c98fac +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 52e0c06dc7b470117fa52359dbedbac1396bf57e +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest 2dcd0af568b0cf583645c8a317dd12e344b1c72a +clk 72ad679aa7182d23d269cbe4d655f7e129d3b057 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 1a695a905c18548062509178b98bc91e67510864 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc 6436d4c1a83cbe083e54c53bb2b16efaab9b62f4 +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight 706700160586cdfd0577477730646eab9acf2b80 +rtc c361db5c2c64f1b7ffed5e9cc42e5062432238f2 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 36092ee8ba695fce023b2118ececa6c2a56b1331 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +akpm-current 8e2bc198f1d469b814bc804e8b3327f3abcb678f +akpm 8a5177ba836f95e6c44df6ef2e40cea00aecaa8a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..0b4d39a63ebf --- /dev/null +++ b/Next/Trees @@ -0,0 +1,237 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..6d70d1b74297 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5200 @@ +$ date -R +Tue, 14 Jun 2016 09:51:53 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c8ae067f2635 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs +Merging origin/master (5edb56491d48 Linux 4.7-rc3) +$ git merge origin/master +Updating c8ae067f2635..5edb56491d48 +Fast-forward + Documentation/devicetree/bindings/hwmon/ina2xx.txt | 1 + + .../bindings/i2c/i2c-arb-gpio-challenge.txt | 4 +- + .../devicetree/bindings/i2c/i2c-demux-pinctrl.txt | 3 +- + .../devicetree/bindings/i2c/i2c-mux-gpio.txt | 6 +- + .../devicetree/bindings/i2c/i2c-mux-pinctrl.txt | 4 +- + .../devicetree/bindings/i2c/i2c-mux-reg.txt | 6 +- + .../devicetree/bindings/net/marvell-bt-sd8xxx.txt | 8 +- + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 8 +- + Makefile | 2 +- + arch/arc/Kconfig | 31 +- + arch/arc/Makefile | 2 +- + arch/arc/boot/dts/abilis_tb100.dtsi | 2 - + arch/arc/boot/dts/abilis_tb101.dtsi | 2 - + arch/arc/boot/dts/axc001.dtsi | 1 - + arch/arc/boot/dts/axc003.dtsi | 1 - + arch/arc/boot/dts/axc003_idu.dtsi | 1 - + arch/arc/boot/dts/eznps.dts | 1 - + arch/arc/boot/dts/nsim_700.dts | 1 - + arch/arc/boot/dts/nsimosci.dts | 1 - + arch/arc/boot/dts/nsimosci_hs.dts | 1 - + arch/arc/boot/dts/nsimosci_hs_idu.dts | 1 - + arch/arc/boot/dts/skeleton.dtsi | 1 - + arch/arc/boot/dts/skeleton_hs.dtsi | 1 - + arch/arc/boot/dts/skeleton_hs_idu.dtsi | 1 - + arch/arc/boot/dts/vdk_axc003.dtsi | 1 - + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 1 - + arch/arc/include/asm/atomic.h | 45 +-- + arch/arc/include/asm/entry-compact.h | 4 +- + arch/arc/include/asm/mmu_context.h | 2 +- + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/processor.h | 2 +- + arch/arc/include/asm/smp.h | 2 +- + arch/arc/include/asm/spinlock.h | 292 ----------------- + arch/arc/include/asm/thread_info.h | 2 +- + arch/arc/include/asm/uaccess.h | 2 +- + arch/arc/include/uapi/asm/swab.h | 2 +- + arch/arc/kernel/entry-compact.S | 18 +- + arch/arc/kernel/intc-compact.c | 6 +- + arch/arc/kernel/perf_event.c | 2 +- + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/signal.c | 2 +- + arch/arc/kernel/troubleshoot.c | 2 +- + arch/arc/mm/cache.c | 6 +- + arch/arc/mm/dma.c | 2 +- + arch/arm64/mm/fault.c | 2 +- + arch/powerpc/include/asm/nohash/64/pgalloc.h | 2 +- + arch/powerpc/kernel/prom_init.c | 2 +- + arch/powerpc/kernel/ptrace.c | 4 +- + arch/powerpc/mm/hash_native_64.c | 6 +- + arch/powerpc/mm/tlb-radix.c | 8 +- + arch/powerpc/platforms/pseries/iommu.c | 4 +- + arch/x86/boot/Makefile | 3 + + arch/x86/events/intel/rapl.c | 2 +- + arch/x86/events/intel/uncore_snbep.c | 21 -- + arch/x86/include/asm/intel-family.h | 68 ++++ + arch/x86/include/asm/msr.h | 4 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/cpu/amd.c | 4 +- + arch/x86/kernel/traps.c | 20 +- + block/blk-lib.c | 12 +- + block/blk-mq.c | 17 +- + drivers/acpi/bus.c | 2 +- + drivers/acpi/ec.c | 29 +- + drivers/acpi/internal.h | 2 +- + drivers/block/nbd.c | 2 +- + drivers/block/xen-blkfront.c | 35 ++- + drivers/cpufreq/intel_pstate.c | 12 +- + drivers/firmware/efi/arm-init.c | 14 +- + drivers/gpio/Kconfig | 1 + + drivers/gpio/gpio-104-dio-48e.c | 4 +- + drivers/gpio/gpio-bcm-kona.c | 4 +- + drivers/gpio/gpio-zynq.c | 7 + + drivers/gpio/gpiolib-of.c | 1 + + drivers/gpio/gpiolib.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 3 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 22 +- + drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 5 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 17 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 5 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 20 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 5 + + drivers/gpu/drm/amd/include/amd_shared.h | 1 + + drivers/gpu/drm/amd/include/cgs_common.h | 6 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 8 +- + drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 3 - + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 9 +- + .../drm/amd/powerplay/hwmgr/polaris10_powertune.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 21 -- + .../amd/powerplay/hwmgr/tonga_processpptables.c | 54 ++-- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 7 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 3 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_fbdev.c | 4 + + drivers/gpu/drm/msm/msm_gem.c | 2 + + drivers/gpu/drm/msm/msm_gem_submit.c | 7 + + drivers/gpu/drm/msm/msm_rd.c | 3 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 4 + + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 2 +- + .../drm/nouveau/include/nvkm/subdev/bios/disp.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 + + drivers/gpu/drm/nouveau/nv04_fbcon.c | 7 +- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 13 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h | 9 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 5 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c | 53 ++++ + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 37 ++- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm107.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gm200.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 - + drivers/gpu/drm/vc4/vc4_crtc.c | 32 +- + drivers/gpu/drm/vc4/vc4_drv.c | 14 +- + drivers/gpu/drm/vc4/vc4_kms.c | 16 +- + drivers/gpu/drm/vc4/vc4_regs.h | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +- + drivers/hwmon/fam15h_power.c | 8 +- + drivers/hwmon/lm90.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 99 +++++- + drivers/i2c/busses/i2c-octeon.c | 17 +- + drivers/i2c/muxes/i2c-mux-reg.c | 1 + + drivers/infiniband/core/cache.c | 10 +- + drivers/infiniband/core/cm.c | 4 +- + drivers/infiniband/core/device.c | 6 +- + drivers/infiniband/core/iwpm_msg.c | 2 +- + drivers/infiniband/core/mad.c | 6 +- + drivers/infiniband/core/sysfs.c | 24 +- + drivers/infiniband/hw/hfi1/affinity.c | 31 +- + drivers/infiniband/hw/hfi1/chip.c | 6 +- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/trace.c | 13 - + drivers/infiniband/hw/hfi1/user_sdma.c | 6 +- + drivers/infiniband/hw/mlx4/main.c | 4 +- + drivers/infiniband/hw/mlx5/cq.c | 12 +- + drivers/infiniband/hw/mlx5/main.c | 22 +- + drivers/infiniband/hw/mlx5/qp.c | 41 ++- + drivers/infiniband/hw/usnic/usnic_uiom.c | 5 - + drivers/infiniband/sw/rdmavt/qp.c | 6 + + drivers/infiniband/ulp/ipoib/ipoib.h | 1 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 4 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 15 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 6 + + drivers/infiniband/ulp/srp/ib_srp.c | 7 +- + drivers/media/usb/uvc/uvc_v4l2.c | 97 ++---- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 151 ++++----- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 46 +-- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + + drivers/net/ethernet/ethoc.c | 7 +- + drivers/net/ethernet/freescale/fec_main.c | 8 +- + drivers/net/ethernet/freescale/gianfar.c | 3 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 40 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 69 +++-- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 40 ++- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 38 +++ + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 203 ++++++------ + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 5 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 45 ++- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 4 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 + + drivers/net/ethernet/sfc/mcdi_port.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 16 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + drivers/net/wireless/realtek/rtlwifi/core.c | 6 +- + drivers/nvme/host/pci.c | 9 +- + drivers/of/fdt.c | 15 +- + drivers/of/irq.c | 19 +- + drivers/of/of_reserved_mem.c | 11 +- + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/sd.c | 8 +- + drivers/scsi/sd.h | 5 + + drivers/thermal/cpu_cooling.c | 16 +- + fs/btrfs/ctree.c | 6 +- + fs/btrfs/disk-io.c | 20 +- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent_io.c | 10 +- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/free-space-cache.c | 18 +- + fs/btrfs/hash.c | 5 + + fs/btrfs/hash.h | 1 + + fs/btrfs/super.c | 57 ++-- + fs/btrfs/tests/btrfs-tests.c | 6 +- + fs/btrfs/tests/btrfs-tests.h | 27 +- + fs/btrfs/tests/extent-buffer-tests.c | 13 +- + fs/btrfs/tests/extent-io-tests.c | 86 ++++-- + fs/btrfs/tests/free-space-tests.c | 76 +++-- + fs/btrfs/tests/free-space-tree-tests.c | 30 +- + fs/btrfs/tests/inode-tests.c | 344 +++++++++++---------- + fs/btrfs/tests/qgroup-tests.c | 111 ++++--- + fs/btrfs/volumes.c | 109 ++++++- + fs/ecryptfs/kthread.c | 13 +- + fs/proc/root.c | 7 + + include/asm-generic/qspinlock.h | 53 +--- + include/linux/cpuidle.h | 3 + + include/linux/efi.h | 2 +- + include/linux/mlx5/device.h | 8 +- + include/linux/mlx5/mlx5_ifc.h | 12 +- + include/linux/mlx5/qp.h | 6 +- + include/linux/mlx5/vport.h | 2 + + include/linux/of.h | 2 +- + include/linux/of_pci.h | 2 +- + include/linux/of_reserved_mem.h | 7 + + include/linux/seqlock.h | 7 +- + include/linux/thermal.h | 2 + + include/net/compat.h | 1 + + include/net/ip_vs.h | 2 +- + include/net/netfilter/nf_queue.h | 4 +- + include/net/netns/netfilter.h | 2 + + include/net/pkt_cls.h | 10 +- + include/net/sch_generic.h | 6 +- + include/rdma/ib_verbs.h | 6 +- + include/uapi/linux/btrfs.h | 2 +- + include/uapi/linux/gtp.h | 2 +- + include/uapi/sound/Kbuild | 3 + + kernel/events/core.c | 6 +- + kernel/futex.c | 14 +- + kernel/locking/mutex.c | 9 +- + kernel/locking/qspinlock.c | 60 ++++ + kernel/relay.c | 1 + + kernel/sched/core.c | 29 +- + kernel/sched/debug.c | 15 +- + kernel/sched/idle.c | 2 +- + kernel/sched/stats.h | 3 + + kernel/trace/bpf_trace.c | 4 +- + mm/fadvise.c | 11 + + mm/hugetlb.c | 42 ++- + mm/kasan/kasan.c | 4 +- + mm/memcontrol.c | 2 +- + mm/page-writeback.c | 21 +- + mm/swap.c | 20 +- + mm/swap_state.c | 5 +- + net/bridge/br_fdb.c | 2 + + net/compat.c | 20 +- + net/core/gen_stats.c | 2 + + net/core/net-sysfs.c | 1 + + net/ipv4/udp.c | 10 +- + net/ipv6/ip6_gre.c | 3 + + net/ipv6/ip6_output.c | 11 +- + net/ipv6/netfilter/nf_dup_ipv6.c | 1 + + net/ipv6/tcp_ipv6.c | 4 +- + net/ipv6/udp.c | 12 +- + net/l2tp/l2tp_core.c | 2 +- + net/mac80211/mesh.c | 4 + + net/mac80211/sta_info.h | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 5 +- + net/netfilter/ipvs/ip_vs_core.c | 5 +- + net/netfilter/nf_conntrack_ftp.c | 1 + + net/netfilter/nf_conntrack_helper.c | 9 +- + net/netfilter/nf_conntrack_irc.c | 1 + + net/netfilter/nf_conntrack_sane.c | 1 + + net/netfilter/nf_conntrack_sip.c | 1 + + net/netfilter/nf_conntrack_standalone.c | 2 - + net/netfilter/nf_conntrack_tftp.c | 1 + + net/netfilter/nf_queue.c | 17 +- + net/netfilter/nf_tables_api.c | 2 + + net/netfilter/nfnetlink_queue.c | 20 +- + net/netfilter/x_tables.c | 4 +- + net/packet/af_packet.c | 25 ++ + net/rds/rds.h | 2 + + net/rds/recv.c | 2 + + net/rds/send.c | 1 + + net/rds/tcp.c | 78 ++++- + net/rds/tcp.h | 1 + + net/rds/tcp_connect.c | 2 +- + net/rds/tcp_listen.c | 20 +- + net/rds/threads.c | 10 +- + net/rxrpc/rxkad.c | 4 +- + net/sched/act_police.c | 33 +- + net/sched/cls_flower.c | 6 +- + net/sched/cls_u32.c | 72 +++-- + net/sched/sch_drr.c | 4 + + net/sched/sch_fq_codel.c | 26 +- + net/sched/sch_generic.c | 2 + + net/sched/sch_hfsc.c | 12 +- + net/sched/sch_ingress.c | 12 + + net/sched/sch_prio.c | 4 + + net/sched/sch_qfq.c | 6 +- + net/sched/sch_red.c | 4 + + net/sched/sch_tbf.c | 4 + + net/tipc/netlink_compat.c | 3 +- + net/wireless/core.c | 2 - + net/wireless/wext-core.c | 25 +- + scripts/mod/file2alias.c | 2 +- + sound/pci/hda/hda_intel.c | 11 +- + sound/pci/hda/patch_realtek.c | 73 ++++- + tools/perf/util/data-convert-bt.c | 41 ++- + tools/perf/util/event.c | 2 + + tools/perf/util/symbol.c | 16 +- + tools/testing/selftests/net/reuseport_bpf.c | 10 +- + 321 files changed, 2810 insertions(+), 1877 deletions(-) + create mode 100644 arch/x86/include/asm/intel-family.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c +Merging fixes/master (5edb56491d48 Linux 4.7-rc3) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (b36fad65d61f kbuild: Initialize exported variables) +$ git merge kbuild-current/rc-fixes +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging arc-current/for-curr (5edb56491d48 Linux 4.7-rc3) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (56530f5d2ddc ARM: 8579/1: mm: Fix definition of pmd_mknotpresent) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/pgtable-2level.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 5 +++-- + arch/arm/include/asm/pgtable.h | 1 - + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (3b6d1eb7ea65 powerpc/mm/hash: Compute the segment size correctly for ISA 3.0) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (6b15d6650c53 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge sparc/master +Already up-to-date. +Merging net/master (d941ebe88a41 net: ethernet: ti: cpsw: use destroy ctlr to destroy channels) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/amd/au1000_eth.c | 4 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 61 ++++++++++++++++++++--------- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 3 ++ + drivers/net/ethernet/ti/cpsw.c | 4 -- + drivers/net/phy/smsc.c | 17 ++------ + include/linux/inet_diag.h | 6 +++ + net/bridge/br_input.c | 15 +++++-- + net/ipv4/ipconfig.c | 4 +- + net/sched/sch_prio.c | 32 ++++++--------- + net/sctp/sctp_diag.c | 6 --- + 10 files changed, 84 insertions(+), 68 deletions(-) +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (50219538ffc0 vmxnet3: segCnt can be 1 for LRO packets) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (182fd9eecb28 MAINTAINERS: Add file patterns for wireless device tree bindings) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (3d5fdff46c4b wext: Fix 32 bit iwpriv compatibility issue with 64 bit Kernel) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (35639a0e9839 ALSA: hda - Add PCI ID for Kabylake) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (96381c04ef9b PCI: hv: Handle all pending messages in hv_pci_onchannelcallback()) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + drivers/pci/host/pci-hyperv.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) +Merging driver-core.current/driver-core-linus (5edb56491d48 Linux 4.7-rc3) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (5edb56491d48 Linux 4.7-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (e4600d56323e Merge tag 'phy-for-4.7-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-linus) +$ git merge usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 58 ++--- + MAINTAINERS | 1 + + drivers/phy/phy-exynos-mipi-video.c | 6 +- + drivers/phy/phy-ti-pipe3.c | 15 +- + drivers/phy/phy-twl4030-usb.c | 14 +- + drivers/usb/core/quirks.c | 23 +- + drivers/usb/dwc2/core.h | 27 +++ + drivers/usb/dwc2/gadget.c | 24 +- + drivers/usb/dwc3/core.h | 1 + + drivers/usb/dwc3/dwc3-exynos.c | 19 +- + drivers/usb/dwc3/dwc3-st.c | 10 +- + drivers/usb/dwc3/gadget.c | 30 ++- + drivers/usb/gadget/composite.c | 21 +- + drivers/usb/gadget/configfs.c | 1 + + drivers/usb/gadget/function/f_fs.c | 30 +-- + drivers/usb/gadget/function/f_printer.c | 8 - + drivers/usb/gadget/function/f_tcm.c | 20 +- + drivers/usb/gadget/function/f_uac2.c | 13 +- + drivers/usb/gadget/function/storage_common.c | 4 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/udc/udc-core.c | 12 +- + drivers/usb/host/ehci-hcd.c | 9 + + drivers/usb/host/ehci-hub.c | 14 +- + drivers/usb/host/ehci-msm.c | 14 +- + drivers/usb/host/ehci-tegra.c | 16 +- + drivers/usb/host/ohci-q.c | 3 +- + drivers/usb/host/xhci-pci.c | 5 + + drivers/usb/host/xhci-plat.c | 3 + + drivers/usb/host/xhci-ring.c | 30 ++- + drivers/usb/host/xhci.c | 29 +-- + drivers/usb/musb/musb_core.c | 85 ++++--- + drivers/usb/musb/musb_core.h | 3 +- + drivers/usb/musb/musb_gadget.c | 34 ++- + drivers/usb/musb/musb_host.c | 68 +++--- + drivers/usb/musb/omap2430.c | 257 ++++++++-------------- + drivers/usb/musb/sunxi.c | 39 ++-- + drivers/usb/phy/phy-twl6030-usb.c | 29 ++- + drivers/usb/serial/mos7720.c | 1 + + drivers/usb/storage/uas.c | 2 +- + include/linux/usb/gadget.h | 3 + + include/linux/usb/musb.h | 5 +- + 41 files changed, 563 insertions(+), 440 deletions(-) +Merging usb-gadget-fixes/fixes (50c763f8c1ba usb: dwc3: Set the ClearPendIN bit on Clear Stall EP command) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (af8c34ce6ae3 Linux 4.7-rc2) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (a9cc4006155a staging: lustre: lnet: Don't access NULL NI on failure path) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 2 +- + drivers/iio/accel/st_accel_buffer.c | 2 +- + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/common/st_sensors/st_sensors_buffer.c | 25 ++---- + drivers/iio/common/st_sensors/st_sensors_core.c | 8 ++ + drivers/iio/common/st_sensors/st_sensors_trigger.c | 96 ++++++++++++++++++++-- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/iio/gyro/st_gyro_buffer.c | 2 +- + drivers/iio/gyro/st_gyro_core.c | 1 + + drivers/iio/humidity/am2315.c | 4 +- + drivers/iio/humidity/hdc100x.c | 20 ++--- + drivers/iio/imu/bmi160/bmi160_core.c | 16 ++-- + drivers/iio/industrialio-trigger.c | 23 ++++-- + drivers/iio/light/apds9960.c | 1 + + drivers/iio/light/bh1780.c | 10 ++- + drivers/iio/light/max44000.c | 1 - + drivers/iio/magnetometer/st_magn_buffer.c | 2 +- + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/pressure/bmp280.c | 4 +- + drivers/iio/pressure/st_pressure_buffer.c | 2 +- + drivers/iio/pressure/st_pressure_core.c | 81 +++++++++++------- + drivers/iio/proximity/as3935.c | 17 ++-- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 7 +- + include/linux/iio/common/st_sensors.h | 9 +- + 24 files changed, 234 insertions(+), 103 deletions(-) +Merging char-misc.current/char-misc-linus (69f1804a9ab6 mei: don't use wake_up_interruptible for wr_ctrl) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/misc/mei/client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (540c26087bfb Input: xpad - fix rumble on Xbox One controllers with 2015 firmware) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/joystick/xpad.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) +Merging crypto-current/master (19ced623db2f crypto: ux500 - memmove the right size) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/ux500/hash/hash_core.c | 4 ++-- + drivers/crypto/vmx/aes_cbc.c | 2 +- + drivers/crypto/vmx/aes_ctr.c | 2 +- + drivers/crypto/vmx/ppc-xlate.pl | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (ce7585f3c4d7 vfio/pci: Allow VPD short read) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (1a77e2bd8c89 kselftests: timers: Add set-tz test case) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/timers/Makefile | 3 +- + tools/testing/selftests/timers/set-tz.c | 119 ++++++++++++++++++++++++++++++++ + 2 files changed, 121 insertions(+), 1 deletion(-) + create mode 100644 tools/testing/selftests/timers/set-tz.c +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (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 (356d27bbfe33 drm/i915: Extract physical display dimensions from VBT) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/intel_bios.c | 46 ++++++++++++++++++++++++++++++++++- + drivers/gpu/drm/i915/intel_display.c | 40 +++++++++++++++++++----------- + drivers/gpu/drm/i915/intel_dp.c | 18 ++++++++------ + drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 +++ + drivers/gpu/drm/i915/intel_drv.h | 2 +- + drivers/gpu/drm/i915/intel_dsi.c | 3 +++ + drivers/gpu/drm/i915/intel_hdmi.c | 3 +++ + drivers/gpu/drm/i915/intel_lvds.c | 2 ++ + drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +++--- + 10 files changed, 98 insertions(+), 27 deletions(-) +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (5edb56491d48 Linux 4.7-rc3) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (c524c9d378f8 Merge branches 'component', 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/assembler.h | 4 ++-- + arch/arm/include/asm/ptrace.h | 10 ++++++++++ + arch/arm/include/asm/uaccess.h | 8 -------- + arch/arm/kernel/asm-offsets.c | 4 +++- + arch/arm/kernel/entry-armv.S | 12 ++++++------ + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/entry-header.S | 8 ++++---- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/process.c | 2 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 10 ++++++++-- + drivers/gpu/drm/armada/armada_drv.c | 9 +++++++-- + drivers/gpu/drm/drm_of.c | 13 +++++++++---- + drivers/gpu/drm/msm/msm_drv.c | 8 +++++++- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 13 ++++++++++--- + drivers/gpu/drm/sti/sti_drv.c | 9 +++++++-- + drivers/gpu/drm/tilcdc/tilcdc_external.c | 9 +++++++-- + drivers/iommu/mtk_iommu.c | 13 ++++++++++--- + 17 files changed, 93 insertions(+), 43 deletions(-) +Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (813f80af1dc9 ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 4 + + arch/arm/Kconfig | 34 +- + arch/arm/arm-soc-for-next-contents.txt | 39 +++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 32 +- + arch/arm/boot/dts/dm8148-evm.dts | 8 + + arch/arm/boot/dts/dm8148-t410.dts | 9 + + arch/arm/boot/dts/dra7.dtsi | 2 + + arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +- + arch/arm/boot/dts/omap3-igep.dtsi | 1 + + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 11 + + arch/arm/boot/dts/omap3-n900.dts | 4 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 +- + arch/arm/boot/dts/omap3-zoom3.dts | 6 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 48 ++- + arch/arm/boot/dts/omap5-igep0050.dts | 26 ++ + arch/arm/boot/dts/omap5-uevm.dts | 10 + + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 - + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 2 - + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 2 +- + arch/arm/mach-bcm/Kconfig | 7 +- + arch/arm/mach-berlin/Kconfig | 2 +- + arch/arm/mach-digicolor/Kconfig | 2 +- + arch/arm/mach-exynos/Kconfig | 3 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-integrator/Kconfig | 4 +- + arch/arm/mach-meson/Kconfig | 2 +- + arch/arm/mach-mmp/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mv78xx0/Kconfig | 2 +- + arch/arm/mach-mvebu/Kconfig | 4 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nomadik/Kconfig | 2 +- + arch/arm/mach-omap2/Kconfig | 12 +- + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/omap-smp.c | 48 ++- + arch/arm/mach-orion5x/Kconfig | 2 +- + arch/arm/mach-oxnas/Kconfig | 2 +- + arch/arm/mach-picoxcell/Kconfig | 2 +- + arch/arm/mach-prima2/Kconfig | 2 +- + arch/arm/mach-rockchip/Kconfig | 2 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 2 +- + arch/arm/mach-s5pv210/Kconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 2 +- + arch/arm/mach-spear/Kconfig | 2 +- + arch/arm/mach-sti/Kconfig | 2 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-tegra/Kconfig | 2 +- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-uniphier/platsmp.c | 18 +- + arch/arm/mach-ux500/Kconfig | 2 +- + arch/arm/mach-vexpress/Kconfig | 2 +- + arch/arm/mach-vt8500/Kconfig | 2 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/arm64/boot/dts/lg/Makefile | 1 + + arch/arm64/boot/dts/lg/lg1312.dtsi | 2 +- + arch/arm64/boot/dts/lg/lg1313-ref.dts | 36 +++ + arch/arm64/boot/dts/lg/lg1313.dtsi | 351 +++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/reset/Kconfig | 4 + + drivers/reset/core.c | 37 +++ + drivers/reset/reset-ath79.c | 3 +- + drivers/reset/reset-oxnas.c | 12 +- + drivers/reset/reset-pistachio.c | 12 +- + drivers/reset/reset-socfpga.c | 12 +- + drivers/reset/reset-sunxi.c | 12 +- + drivers/reset/reset-zynq.c | 12 +- + drivers/reset/sti/Kconfig | 1 - + include/linux/reset-controller.h | 4 + + include/linux/reset.h | 4 +- + 74 files changed, 741 insertions(+), 167 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm64/boot/dts/lg/lg1313-ref.dts + create mode 100644 arch/arm64/boot/dts/lg/lg1313.dtsi +Merging amlogic/for-next (7493d8a4a133 Merge branch 'v4.7/deps/external' into aml-reset) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../bindings/reset/amlogic,meson-reset.txt | 18 ++ + arch/arm/boot/dts/meson8b.dtsi | 7 + + arch/arm64/Kconfig.platforms | 2 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 20 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 9 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 159 +++++++++++++++- + drivers/reset/Makefile | 1 + + drivers/reset/reset-meson.c | 136 +++++++++++++ + .../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 210 +++++++++++++++++++++ + include/dt-bindings/reset/amlogic,meson8b-reset.h | 175 +++++++++++++++++ + 12 files changed, 741 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt + create mode 100644 drivers/reset/reset-meson.c + create mode 100644 include/dt-bindings/reset/amlogic,meson-gxbb-reset.h + create mode 100644 include/dt-bindings/reset/amlogic,meson8b-reset.h +Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (c40921768f5f Merge branch anholt/bcm2835-dt-64-next into for-next) +$ git merge bcm2835/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 ++ + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + + arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi | 19 ++++++ + arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | 19 ++++++ + arch/arm/boot/dts/bcm283x.dtsi | 2 + + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 30 +++++++++ + arch/arm64/boot/dts/broadcom/bcm2837.dtsi | 76 ++++++++++++++++++++++ + arch/arm64/include/asm/dma-mapping.h | 17 ++++- + drivers/gpu/drm/vc4/vc4_dpi.c | 14 +--- + 13 files changed, 173 insertions(+), 13 deletions(-) + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9512.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-smsc9514.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837.dtsi +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (12f06592e8f6 Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Removing arch/arm/mach-imx/eukrea-baseboards.h +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/fsl-fec.txt | 3 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/imx1-ads.dts | 4 +- + arch/arm/boot/dts/imx1-apf9328.dts | 4 +- + arch/arm/boot/dts/imx23-sansa.dts | 207 +++++++++++ + arch/arm/boot/dts/imx23-xfi3.dts | 179 ++++++++++ + arch/arm/boot/dts/imx23.dtsi | 48 +++ + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 4 +- + arch/arm/boot/dts/imx25-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 2 +- + .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 6 +- + arch/arm/boot/dts/imx27-pdk.dts | 2 +- + arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 6 +- + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 4 +- + arch/arm/boot/dts/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 2 +- + arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi | 4 + + arch/arm/boot/dts/imx28-evk.dts | 2 +- + arch/arm/boot/dts/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 5 + + arch/arm/boot/dts/imx31-bug.dts | 2 +- + .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 4 +- + arch/arm/boot/dts/imx35-pdk.dts | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 4 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 4 +- + arch/arm/boot/dts/imx51-ts4800.dts | 27 ++ + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53-tqma53.dtsi | 2 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 4 +- + arch/arm/boot/dts/imx6q-arm2.dts | 3 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 259 +++++++++++--- + arch/arm/boot/dts/imx6q-h100.dts | 395 +++++++++++++++++++++ + arch/arm/boot/dts/imx6q-utilite-pro.dts | 153 ++++++++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-microsom.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 3 +- + arch/arm/boot/dts/imx6qdl.dtsi | 3 +- + arch/arm/boot/dts/imx6sl-warp.dts | 2 +- + arch/arm/boot/dts/imx6sl.dtsi | 13 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/imx6sx.dtsi | 12 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 51 ++- + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 2 +- + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 4 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 9 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 2 +- + arch/arm/boot/dts/imx7d.dtsi | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 1 + + arch/arm/mach-imx/common.h | 1 - + arch/arm/mach-imx/cpuidle-imx6q.c | 16 + + arch/arm/mach-imx/devices/devices.c | 3 + + arch/arm/mach-imx/devices/platform-gpio-mxc.c | 1 + + arch/arm/mach-imx/eukrea-baseboards.h | 42 --- + arch/arm/mach-imx/mach-imx50.c | 1 - + arch/arm/mach-imx/mach-imx51.c | 1 - + arch/arm/mach-imx/mach-imx53.c | 1 - + arch/arm/mach-imx/mach-imx6q.c | 2 +- + arch/arm/mach-imx/mach-imx6ul.c | 2 +- + arch/arm/mach-imx/tzic.c | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 13 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 20 +- + drivers/clk/imx/clk-imx6q.c | 14 +- + drivers/clk/imx/clk-imx6sl.c | 14 +- + drivers/clk/imx/clk-imx6sx.c | 14 +- + drivers/clk/imx/clk-imx6ul.c | 14 +- + drivers/clk/imx/clk-imx7d.c | 14 +- + drivers/clk/imx/clk-pllv3.c | 16 +- + drivers/net/ethernet/freescale/fec.h | 2 + + drivers/net/ethernet/freescale/fec_main.c | 12 + + include/soc/imx/cpuidle.h | 25 ++ + 86 files changed, 1505 insertions(+), 242 deletions(-) + create mode 100644 arch/arm/boot/dts/imx23-sansa.dts + create mode 100644 arch/arm/boot/dts/imx23-xfi3.dts + create mode 100644 arch/arm/boot/dts/imx6q-h100.dts + create mode 100644 arch/arm/boot/dts/imx6q-utilite-pro.dts + delete mode 100644 arch/arm/mach-imx/eukrea-baseboards.h + create mode 100644 include/soc/imx/cpuidle.h +Merging keystone/next (4ae152393ae0 Merge branch 'for_4.8/keystone_dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/keystone-k2e.dtsi | 7 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 11 +++ + arch/arm/boot/dts/keystone-k2g.dtsi | 8 ++ + arch/arm/boot/dts/keystone-k2l.dtsi | 149 +++++++++++++++++++++++++++++++++ + arch/arm/boot/dts/keystone.dtsi | 7 +- + arch/arm/configs/keystone_defconfig | 1 + + arch/arm/mach-keystone/Kconfig | 1 + + include/dt-bindings/pinctrl/keystone.h | 39 +++++++++ + 8 files changed, 219 insertions(+), 4 deletions(-) + create mode 100644 include/dt-bindings/pinctrl/keystone.h +Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (f823934678b5 Merge tag 'omap-for-v4.7/fixes-powedomain' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/dma/ti-edma.txt | 4 +- + .../devicetree/bindings/pwm/pwm-tiecap.txt | 38 ++++- + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 38 ++++- + .../devicetree/bindings/pwm/pwm-tipwmss.txt | 33 +++- + arch/arm/boot/dts/am335x-bone-common.dtsi | 8 +- + arch/arm/boot/dts/am335x-boneblack.dts | 11 ++ + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-icev2.dts | 7 + + arch/arm/boot/dts/am33xx.dtsi | 126 +++++++++++--- + arch/arm/boot/dts/am4372.dtsi | 104 +++++++++--- + arch/arm/boot/dts/am437x-gp-evm.dts | 4 + + arch/arm/boot/dts/am437x-idk-evm.dts | 1 + + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +- + arch/arm/boot/dts/dm814x.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 189 ++++++++++++++++++++- + arch/arm/boot/dts/dra72-evm-common.dtsi | 12 +- + arch/arm/boot/dts/dra72x.dtsi | 16 -- + arch/arm/boot/dts/dra74x.dtsi | 29 +--- + arch/arm/boot/dts/omap3-gta04.dtsi | 66 ++++++- + arch/arm/boot/dts/omap3-n900.dts | 12 ++ + arch/arm/boot/dts/omap3.dtsi | 10 ++ + arch/arm/boot/dts/omap4-duovero.dtsi | 5 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 5 + + arch/arm/boot/dts/omap4-sdp.dts | 5 + + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 5 + + arch/arm/boot/dts/omap5-board-common.dtsi | 5 + + arch/arm/mach-omap1/ams-delta-fiq.c | 2 +- + arch/arm/mach-omap1/include/mach/mtd-xip.h | 2 +- + arch/arm/mach-omap2/Kconfig | 2 + + arch/arm/mach-omap2/board-ldp.c | 3 +- + arch/arm/mach-omap2/board-rx51-video.c | 4 +- + arch/arm/mach-omap2/cm3xxx.c | 2 +- + arch/arm/mach-omap2/display.c | 2 +- + arch/arm/mach-omap2/display.h | 5 + + arch/arm/mach-omap2/dss-common.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 31 ++-- + arch/arm/mach-omap2/mux34xx.c | 4 +- + arch/arm/mach-omap2/omap4-common.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 18 -- + .../omap_hwmod_33xx_43xx_interconnect_data.c | 64 ------- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 84 --------- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 9 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 24 +-- + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 54 ------ + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 41 ----- + arch/arm/mach-omap2/pdata-quirks.c | 18 ++ + arch/arm/mach-omap2/powerdomains7xx_data.c | 76 +-------- + arch/arm/mach-omap2/sdrc.h | 4 +- + drivers/clk/ti/clk-33xx.c | 3 + + drivers/clk/ti/clk-43xx.c | 6 + + include/linux/platform_data/asoc-ti-mcbsp.h | 4 +- + include/linux/platform_data/omapdss.h | 42 +++++ + include/video/omapdss.h | 31 +--- + sound/soc/omap/mcbsp.c | 21 ++- + sound/soc/omap/mcbsp.h | 3 +- + sound/soc/omap/omap-mcbsp.c | 5 +- + 58 files changed, 751 insertions(+), 562 deletions(-) + create mode 100644 include/linux/platform_data/omapdss.h +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (275804c07f41 firmware: qcom: scm: Peripheral Authentication Service) +$ git merge qcom/for-next +Auto-merging arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 28 ++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 138 +++++++++ + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 4 +- + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 116 ++++++++ + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 2 +- + ...tsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} | 0 + ...b600c.dts => qcom-apq8064-arrow-sd-600eval.dts} | 10 +- + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 40 +++ + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 44 +-- + arch/arm/boot/dts/qcom-apq8064.dtsi | 10 +- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 247 ++++++++++++++++ + arch/arm/boot/dts/qcom-apq8084.dtsi | 8 + + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 4 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 28 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 20 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 16 ++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 78 ++++- + drivers/firmware/qcom_scm-32.c | 314 ++++++++++++--------- + drivers/firmware/qcom_scm-64.c | 291 ++++++++++++++++++- + drivers/firmware/qcom_scm.c | 314 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 45 ++- + drivers/soc/qcom/smem_state.c | 12 +- + drivers/soc/qcom/smp2p.c | 7 +- + drivers/soc/qcom/smsm.c | 2 +- + drivers/soc/qcom/wcnss_ctrl.c | 125 ++++++-- + include/linux/qcom_scm.h | 8 + + include/linux/soc/qcom/wcnss_ctrl.h | 8 + + 29 files changed, 1676 insertions(+), 248 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.txt + rename arch/arm/boot/dts/{qcom-apq8064-arrow-db600c-pins.dtsi => qcom-apq8064-arrow-sd-600eval-pins.dtsi} (100%) + rename arch/arm/boot/dts/{qcom-apq8064-arrow-db600c.dts => qcom-apq8064-arrow-sd-600eval.dts} (96%) + create mode 100644 include/linux/soc/qcom/wcnss_ctrl.h +Merging renesas/next (27b5fd3a193b Merge branch 'heads/arm64-dt-for-v4.8' into next) +$ git merge renesas/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power/renesas,rcar-sysc.txt | 1 + + MAINTAINERS | 1 - + arch/arm/boot/dts/emev2-kzm9d.dts | 16 +- + arch/arm/boot/dts/emev2.dtsi | 26 +-- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 8 +- + arch/arm/boot/dts/r8a73a4.dtsi | 34 +-- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 12 +- + arch/arm/boot/dts/r8a7740.dtsi | 2 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 5 +- + arch/arm/boot/dts/r8a7778.dtsi | 28 +-- + arch/arm/boot/dts/r8a7779-marzen.dts | 4 +- + arch/arm/boot/dts/r8a7790-lager.dts | 20 +- + arch/arm/boot/dts/r8a7790.dtsi | 232 ++++++++++++--------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 12 +- + arch/arm/boot/dts/r8a7791-porter.dts | 8 +- + arch/arm/boot/dts/r8a7791.dtsi | 224 +++++++++++--------- + arch/arm/boot/dts/r8a7793-gose.dts | 12 +- + arch/arm/boot/dts/r8a7793.dtsi | 198 +++++++++++------- + arch/arm/boot/dts/r8a7794-silk.dts | 6 +- + arch/arm/boot/dts/r8a7794.dtsi | 132 +++++++----- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 11 +- + arch/arm/boot/dts/sh73a0.dtsi | 2 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 13 +- + arch/arm/mach-shmobile/pm-rmobile.c | 2 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 14 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 100 +++++---- + drivers/Makefile | 1 - + drivers/sh/pm_runtime.c | 9 - + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a7796-sysc.c | 48 +++++ + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 1 - + include/dt-bindings/power/r8a7796-sysc.h | 36 ++++ + 35 files changed, 732 insertions(+), 493 deletions(-) + create mode 100644 drivers/soc/renesas/r8a7796-sysc.c + create mode 100644 include/dt-bindings/power/r8a7796-sysc.h +Merging rockchip/for-next (5e46e8d66d01 Merge branch 'v4.7-clk/fixes' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3288-firefly.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288-miqi.dts | 26 +++--- + arch/arm/boot/dts/rk3288-popmetal.dts | 31 ++++--- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 101 ++++++++++++++++++++++ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 1 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 31 ++++--- + arch/arm/boot/dts/rk3288.dtsi | 5 ++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 16 ++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 16 +++- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 12 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 54 +++++++++++- + drivers/clk/rockchip/clk-cpu.c | 4 +- + drivers/clk/rockchip/clk-mmc-phase.c | 12 +-- + drivers/clk/rockchip/clk-rk3399.c | 17 +++- + 15 files changed, 294 insertions(+), 94 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (a0c8f253cf3e Merge branch 'for-v4.8/exynos-mfc' into for-next) +$ git merge samsung-krzk/for-next +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Auto-merging include/linux/of_reserved_mem.h +Auto-merging drivers/soc/samsung/pm_domains.c +Auto-merging drivers/of/of_reserved_mem.c +Auto-merging arch/arm64/Kconfig.platforms +Removing arch/arm/mach-exynos/s5p-dev-mfc.c +Removing arch/arm/mach-exynos/mfc.h +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Removing arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 694cfa612ed5] Merge remote-tracking branch 'samsung-krzk/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/samsung/samsung-boards.txt | 1 + + .../devicetree/bindings/media/s5p-mfc.txt | 39 +- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 35 + + arch/arm/boot/dts/exynos3250-rinato.dts | 4 - + arch/arm/boot/dts/exynos3250.dtsi | 1 - + arch/arm/boot/dts/exynos4.dtsi | 1 - + arch/arm/boot/dts/exynos4210-origen.dts | 7 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 7 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 29 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 18 + + arch/arm/boot/dts/exynos4412-odroidx.dts | 11 + + arch/arm/boot/dts/exynos4412-odroidx2.dts | 11 + + arch/arm/boot/dts/exynos4412-origen.dts | 23 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 7 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 4 +- + arch/arm/boot/dts/exynos5.dtsi | 215 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 6 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 6 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 15 +- + arch/arm/boot/dts/exynos5250-spring.dts | 6 +- + arch/arm/boot/dts/exynos5250.dtsi | 1701 ++++++------ + arch/arm/boot/dts/exynos5410-odroidxu.dts | 580 ++++ + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 210 ++ + arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +- + arch/arm/boot/dts/exynos5410.dtsi | 333 ++- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 6 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 45 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 12 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 6 +- + arch/arm/boot/dts/exynos5420.dtsi | 2769 +++++++++----------- + arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 103 - + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 104 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 35 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 35 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 50 + + arch/arm/boot/dts/exynos54xx.dtsi | 199 ++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 32 +- + arch/arm/configs/exynos_defconfig | 27 +- + arch/arm/configs/multi_v7_defconfig | 30 +- + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-exynos/Makefile | 3 - + arch/arm/mach-exynos/exynos.c | 19 - + arch/arm/mach-exynos/mfc.h | 16 - + arch/arm/mach-exynos/s5p-dev-mfc.c | 93 - + arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 2 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-n30.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 3 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 1 + + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 1 + + arch/arm/mach-s3c64xx/include/mach/map.h | 2 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 2 +- + arch/arm/plat-samsung/include/plat/fb-s3c2410.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 2 +- + arch/arm/plat-samsung/pm-check.c | 2 +- + arch/arm/plat-samsung/watchdog-reset.c | 2 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 13 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-core.c | 2 + + drivers/media/platform/exynos4-is/fimc-is.c | 2 + + drivers/media/platform/exynos4-is/fimc-lite.c | 2 + + drivers/media/platform/s5p-g2d/g2d.c | 2 + + drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 + + drivers/media/platform/s5p-mfc/s5p_mfc.c | 198 +- + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 79 + + drivers/media/platform/s5p-tv/mixer_video.c | 2 + + drivers/media/v4l2-core/videobuf2-dma-contig.c | 53 + + drivers/of/of_reserved_mem.c | 85 +- + drivers/soc/samsung/Kconfig | 4 + + drivers/soc/samsung/Makefile | 1 + + .../soc/samsung}/pm_domains.c | 34 +- + include/dt-bindings/clock/exynos5410.h | 76 +- + include/linux/of_reserved_mem.h | 25 +- + include/media/videobuf2-dma-contig.h | 2 + + 77 files changed, 4347 insertions(+), 3125 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi + create mode 100644 arch/arm/boot/dts/exynos5410-odroidxu.dts + delete mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi + create mode 100644 arch/arm/boot/dts/exynos54xx.dtsi + delete mode 100644 arch/arm/mach-exynos/mfc.h + delete mode 100644 arch/arm/mach-exynos/s5p-dev-mfc.c + create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h + rename {arch/arm/mach-exynos => drivers/soc/samsung}/pm_domains.c (85%) +Merging tegra/for-next (f59273b16284 Merge branch for-4.8/arm64 into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra114-dalmore.dts | 2 +- + arch/arm/boot/dts/tegra114-roth.dts | 4 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 6 +- + arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- + arch/arm/boot/dts/tegra20-harmony.dts | 2 +- + arch/arm/boot/dts/tegra20-paz00.dts | 2 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- + arch/arm/boot/dts/tegra20-ventana.dts | 2 +- + arch/arm/boot/dts/tegra20-whistler.dts | 2 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 7 +- + arch/arm/boot/dts/tegra30-beaver.dts | 2 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- + arch/arm/mach-tegra/common.h | 22 ++ + arch/arm/mach-tegra/cpuidle-tegra114.c | 1 + + arch/arm/mach-tegra/cpuidle-tegra20.c | 1 + + arch/arm/mach-tegra/cpuidle-tegra30.c | 1 + + arch/arm/mach-tegra/cpuidle.h | 2 + + arch/arm/mach-tegra/hotplug.c | 1 + + arch/arm/mach-tegra/irq.c | 1 + + arch/arm/mach-tegra/pm.h | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 249 ++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 45 ++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 284 +++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 190 ++++++++++++++ + arch/arm64/configs/defconfig | 16 ++ + drivers/clk/tegra/clk-tegra210.c | 94 +++---- + drivers/soc/tegra/pmc.c | 16 +- + 32 files changed, 897 insertions(+), 73 deletions(-) +Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d9d4b90d3c59] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/include/asm/io.h | 2 ++ + 1 file changed, 2 insertions(+) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (5edb56491d48 Linux 4.7-rc3) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (592ddeeff8cb metag: Fix typos) +$ git merge metag/for-next +Auto-merging arch/metag/include/asm/metag_regs.h +Merge made by the 'recursive' strategy. + arch/metag/include/asm/metag_mem.h | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/kernel/cachepart.c | 2 +- + arch/metag/lib/divsi3.S | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (847e858f3d0e SSB: Change bare unsigned to unsigned int to suit coding style) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + drivers/ssb/driver_gpio.c | 22 +++++++++++----------- + 1 file changed, 11 insertions(+), 11 deletions(-) +Merging nios2/for-next (9fa78f63a892 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (5975b2c0c10a Merge branch 'parisc-4.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (138a076496e6 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (86d18a55dd66 s390/topology: remove z10 special handling) +$ git merge s390/features +Removing arch/s390/include/asm/etr.h +Merge made by the 'recursive' strategy. + Documentation/cputopology.txt | 40 +- + Documentation/s390/s390dbf.txt | 2 +- + arch/s390/Kconfig | 15 +- + arch/s390/hypfs/hypfs_diag.c | 2 +- + arch/s390/hypfs/hypfs_vm.c | 2 +- + arch/s390/include/asm/cache.h | 5 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/include/asm/diag.h | 2 +- + arch/s390/include/asm/etr.h | 261 --------- + arch/s390/include/asm/fcx.h | 2 +- + arch/s390/include/asm/ipl.h | 10 +- + arch/s390/include/asm/irq.h | 7 +- + arch/s390/include/asm/jump_label.h | 1 + + arch/s390/include/asm/mmu.h | 2 +- + arch/s390/include/asm/mmu_context.h | 15 +- + arch/s390/include/asm/pgtable.h | 201 ++++++- + arch/s390/include/asm/processor.h | 17 +- + arch/s390/include/asm/sections.h | 1 + + arch/s390/include/asm/stp.h | 51 ++ + arch/s390/include/asm/timex.h | 66 ++- + arch/s390/include/asm/tlbflush.h | 28 +- + arch/s390/include/asm/topology.h | 4 + + arch/s390/include/asm/uaccess.h | 4 +- + arch/s390/kernel/cache.c | 7 +- + arch/s390/kernel/early.c | 22 + + arch/s390/kernel/ipl.c | 25 +- + arch/s390/kernel/irq.c | 7 +- + arch/s390/kernel/machine_kexec.c | 55 +- + arch/s390/kernel/nmi.c | 13 +- + arch/s390/kernel/processor.c | 113 ++-- + arch/s390/kernel/setup.c | 18 +- + arch/s390/kernel/smp.c | 8 +- + arch/s390/kernel/time.c | 1053 ++--------------------------------- + arch/s390/kernel/topology.c | 89 ++- + arch/s390/kernel/vmlinux.lds.S | 21 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/lib/uaccess.c | 6 +- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/init.c | 13 +- + arch/s390/mm/pageattr.c | 263 +++++++-- + arch/s390/mm/pgtable.c | 56 +- + arch/s390/mm/vmem.c | 73 ++- + arch/s390/numa/mode_emu.c | 25 +- + arch/s390/pci/pci_dma.c | 4 +- + drivers/base/topology.c | 13 + + drivers/s390/block/dasd_eckd.c | 4 +- + drivers/s390/char/keyboard.c | 15 +- + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/char/zcore.c | 2 +- + drivers/s390/cio/chp.h | 2 +- + drivers/s390/cio/chsc.c | 8 +- + drivers/s390/cio/idset.h | 2 +- + include/asm-generic/vmlinux.lds.h | 10 +- + include/linux/bitmap.h | 4 + + 55 files changed, 1026 insertions(+), 1653 deletions(-) + delete mode 100644 arch/s390/include/asm/etr.h + create mode 100644 arch/s390/include/asm/stp.h +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (9fbd49cff0f0 tile: allow disabling CONFIG_EARLY_PRINTK) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/setup.h | 5 +++++ + 1 file changed, 5 insertions(+) +Merging uml/linux-next (a78ff1112263 um: add extended processor state save/restore support) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/include/asm/mmu_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (c315ef8d9db7 Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (c717a308f397 Merge branch 'for-next-next-4.7-20160613' into for-next-20160613) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 31 +- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 362 ++++++++++++++++++++- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/ctree.c | 7 +- + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 95 +++--- + fs/btrfs/delayed-inode.h | 10 +- + fs/btrfs/delayed-ref.c | 9 +- + fs/btrfs/disk-io.c | 55 ++-- + fs/btrfs/extent-tree.c | 748 +++++++++++++++++++++++++++---------------- + fs/btrfs/extent_io.c | 49 ++- + fs/btrfs/file.c | 48 +-- + fs/btrfs/inode.c | 144 +++++---- + fs/btrfs/qgroup.c | 19 +- + fs/btrfs/qgroup.h | 9 +- + fs/btrfs/relocation.c | 45 +-- + fs/btrfs/scrub.c | 10 +- + fs/btrfs/super.c | 4 +- + fs/btrfs/transaction.h | 2 +- + fs/btrfs/tree-log.c | 89 ++++- + fs/btrfs/volumes.c | 4 +- + include/trace/events/btrfs.h | 404 +++++++++++++++-------- + 23 files changed, 1533 insertions(+), 634 deletions(-) +Merging ceph/master (f6973c09490c ceph: use i_version to check validity of fscache) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (3bdc426e2497 cifs: dynamic allocation of ntlmssp blob) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsfs.c | 3 +++ + fs/cifs/cifsglob.h | 1 + + fs/cifs/file.c | 14 +++++++--- + fs/cifs/ntlmssp.h | 2 +- + fs/cifs/sess.c | 78 ++++++++++++++++++++++++++++++------------------------ + fs/cifs/smb2pdu.c | 10 ++----- + 6 files changed, 61 insertions(+), 47 deletions(-) +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (b9d8905e4a75 reiserfs: check kstrdup failure) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/reiserfs/super.c | 9 +++++++-- + fs/udf/partition.c | 13 +++++++++---- + fs/udf/super.c | 22 ++++++++++++---------- + fs/udf/udf_sb.h | 5 +++++ + 4 files changed, 33 insertions(+), 16 deletions(-) +Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (fb88de96bd89 f2fs: report error for f2fs_parent_dir) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 3 + + fs/f2fs/acl.c | 9 +- + fs/f2fs/checkpoint.c | 70 +++++++++---- + fs/f2fs/data.c | 136 +++++++++---------------- + fs/f2fs/debug.c | 5 +- + fs/f2fs/dir.c | 111 ++++++++------------ + fs/f2fs/extent_cache.c | 37 +++---- + fs/f2fs/f2fs.h | 204 +++++++++++++++++++++++++++---------- + fs/f2fs/file.c | 113 ++++++++++---------- + fs/f2fs/gc.c | 16 +-- + fs/f2fs/inline.c | 83 +++++---------- + fs/f2fs/inode.c | 46 ++++++--- + fs/f2fs/namei.c | 103 ++++++++----------- + fs/f2fs/node.c | 67 +++++------- + fs/f2fs/node.h | 9 +- + fs/f2fs/recovery.c | 14 ++- + fs/f2fs/segment.c | 47 +++++++-- + fs/f2fs/segment.h | 15 ++- + fs/f2fs/super.c | 121 ++++++++++++++++++++-- + fs/f2fs/xattr.c | 16 ++- + 20 files changed, 689 insertions(+), 536 deletions(-) +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (36e4ad0316c0 GFS2: don't set rgrp gl_object until it's inserted into rgrp tree) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/rgrp.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (631009987f81 Merge branch 'writeback') +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/Makefile | 2 +- + fs/nfs/dir.c | 42 ++++++++------- + fs/nfs/direct.c | 73 ++++++++++++++------------ + fs/nfs/file.c | 59 +++++---------------- + fs/nfs/inode.c | 70 +++++++++++++++++-------- + fs/nfs/internal.h | 13 +++++ + fs/nfs/io.c | 54 +++++++++++++++++++ + fs/nfs/nfs4proc.c | 13 +++-- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/nfstrace.h | 1 - + fs/nfs/pnfs.c | 6 ++- + fs/nfs/pnfs_nfs.c | 12 ++++- + fs/nfs/read.c | 4 +- + fs/nfs/write.c | 15 +----- + include/linux/nfs_fs.h | 4 +- + include/linux/sunrpc/sched.h | 5 ++ + include/linux/sunrpc/xprtsock.h | 1 + + net/sunrpc/sched.c | 67 +++++++++++++++++++----- + net/sunrpc/xprt.c | 14 ++--- + net/sunrpc/xprtsock.c | 113 +++++++++++++++++++++++----------------- + 20 files changed, 355 insertions(+), 215 deletions(-) + create mode 100644 fs/nfs/io.c +$ git reset --hard HEAD^ +HEAD is now at 09524e58f578 Merge remote-tracking branch 'gfs2/for-next' +Merging next-20160609 version of nfs +$ git merge -m next-20160609/nfs af8c34ce6ae32addda3788d54a7e340cad22516b +Already up-to-date. +Merging nfsd/nfsd-next (9e62f931dd07 rpc: share one xps between all backchannels) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/sunrpc/clnt.c +Auto-merging include/linux/sunrpc/xprt.h +Auto-merging include/linux/sunrpc/clnt.h +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4callback.c | 18 +----------------- + include/linux/sunrpc/clnt.h | 2 -- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xprt.h | 1 + + net/sunrpc/clnt.c | 31 +++++++++++++++++++++++++------ + net/sunrpc/svc_xprt.c | 2 ++ + net/sunrpc/xprtsock.c | 1 + + 7 files changed, 31 insertions(+), 25 deletions(-) +Merging orangefs/for-next (2dcd0af568b0 Linux 4.6) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (6510690149a9 ovl: store ovl_entry in inode->i_private for all inodes) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/namei.c +Auto-merging fs/dcache.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/Locking | 4 +- + Documentation/filesystems/vfs.txt | 39 +++++++++++------ + fs/dcache.c | 3 -- + fs/namei.c | 2 +- + fs/open.c | 17 ++++++-- + fs/overlayfs/inode.c | 89 +++++++++------------------------------ + fs/overlayfs/overlayfs.h | 2 +- + fs/overlayfs/super.c | 18 ++++++-- + include/linux/dcache.h | 35 ++++++++------- + include/linux/fs.h | 2 +- + net/unix/af_unix.c | 6 +-- + 11 files changed, 101 insertions(+), 116 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (1112018cefc5 ubifs: ubifs_dump_inode: Fix dumping field bulk_read) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (26f1fe858f27 xfs: reduce lock hold times in buffer writeback) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.c | 2 +- + fs/xfs/libxfs/xfs_alloc.h | 7 ----- + fs/xfs/libxfs/xfs_attr_leaf.h | 3 --- + fs/xfs/libxfs/xfs_fs.h | 8 ++---- + fs/xfs/libxfs/xfs_rtbitmap.c | 2 +- + fs/xfs/xfs_attr_inactive.c | 2 +- + fs/xfs/xfs_attr_list.c | 2 +- + fs/xfs/xfs_bmap_util.c | 6 ++--- + fs/xfs/xfs_bmap_util.h | 2 -- + fs/xfs/xfs_buf.c | 60 +++++++++++++++++++++++++------------------ + fs/xfs/xfs_buf_item.c | 18 +++++++++---- + fs/xfs/xfs_inode.c | 16 +++--------- + fs/xfs/xfs_inode.h | 7 ----- + fs/xfs/xfs_log.c | 8 +++--- + fs/xfs/xfs_log.h | 5 ---- + fs/xfs/xfs_rtalloc.h | 2 -- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_super.h | 2 -- + 18 files changed, 65 insertions(+), 89 deletions(-) +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (1eb82bc8e712 Merge branch 'for-linus' into for-next) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/inode.c | 2 +- + fs/orangefs/namei.c | 2 +- + fs/orangefs/orangefs-kernel.h | 6 +++--- + fs/orangefs/symlink.c | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) +Merging pci/next (af8c34ce6ae3 Linux 4.7-rc2) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (cae7316708c4 efi-pstore: implement efivars_pstore_exit()) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/nvram_64.c | 4 +- + drivers/acpi/apei/erst.c | 7 +- + drivers/firmware/efi/efi-pstore.c | 13 ++ + fs/pstore/Kconfig | 31 ++++- + fs/pstore/inode.c | 1 - + fs/pstore/platform.c | 269 +++++++++++++++++++++++++++++++++----- + fs/pstore/ram.c | 10 +- + include/linux/pstore.h | 3 +- + 8 files changed, 291 insertions(+), 47 deletions(-) +Merging hid/for-next (9037766900ff Merge branch 'for-4.8/i2c-hid' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-elo.c | 2 +- + drivers/hid/hid-multitouch.c | 5 +++++ + drivers/hid/i2c-hid/i2c-hid.c | 1 + + drivers/hid/uhid.c | 33 ++++++++++++++++++++++++--------- + 4 files changed, 31 insertions(+), 10 deletions(-) +Merging i2c/i2c/for-next (33c77abcf4aa i2c: robotfuzz-osif: Constify osif_table) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c.txt | 7 +++++ + drivers/i2c/busses/i2c-i801.c | 2 +- + drivers/i2c/busses/i2c-jz4780.c | 4 --- + drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +- + drivers/i2c/i2c-core.c | 41 +++++++++++++++++++++++++++ + include/linux/i2c.h | 5 ++++ + 6 files changed, 55 insertions(+), 6 deletions(-) +Merging jdelvare-hwmon/master (18c358ac5e32 Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (6bd8de90309e hwmon: Add support for INA3221 Triple Current/Voltage Monitors) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + Documentation/hwmon/abituguru | 2 +- + Documentation/hwmon/ina3221 | 35 ++ + Documentation/hwmon/max1668 | 2 +- + Documentation/hwmon/sht3x | 72 ++++ + Documentation/hwmon/tmp401 | 14 +- + drivers/hwmon/Kconfig | 24 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/ina3221.c | 446 ++++++++++++++++++++++ + drivers/hwmon/sht3x.c | 725 ++++++++++++++++++++++++++++++++++++ + drivers/hwmon/tmp401.c | 35 +- + include/linux/platform_data/sht3x.h | 25 ++ + 11 files changed, 1371 insertions(+), 11 deletions(-) + create mode 100644 Documentation/hwmon/ina3221 + create mode 100644 Documentation/hwmon/sht3x + create mode 100644 drivers/hwmon/ina3221.c + create mode 100644 drivers/hwmon/sht3x.c + create mode 100644 include/linux/platform_data/sht3x.h +Merging v4l-dvb/master (be77ec684f3d Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/platform/s5p-mfc/s5p_mfc_iommu.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging pm/linux-next (a42dcdb2922f Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/cpu-freq/core.txt | 4 +- + Documentation/cpu-freq/cpu-drivers.txt | 10 +- + arch/arm64/include/asm/acpi.h | 8 + + arch/arm64/include/asm/numa.h | 2 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi_numa.c | 112 ++++++++++++++ + arch/arm64/kernel/smp.c | 2 + + arch/arm64/mm/numa.c | 28 ++-- + arch/ia64/include/asm/acpi.h | 3 + + arch/ia64/kernel/acpi.c | 2 +- + arch/ia64/kernel/setup.c | 1 + + arch/powerpc/platforms/cell/cpufreq_spudemand.c | 72 +++++---- + arch/x86/include/asm/acpi.h | 1 - + arch/x86/mm/numa.c | 2 +- + arch/x86/mm/srat.c | 116 +-------------- + drivers/acpi/numa.c | 189 +++++++++++++++++------- + drivers/acpi/processor_core.c | 26 +++- + drivers/cpufreq/Kconfig | 13 +- + drivers/cpufreq/amd_freq_sensitivity.c | 10 +- + drivers/cpufreq/cpufreq.c | 186 ++++++++++++----------- + drivers/cpufreq/cpufreq_conservative.c | 51 ++++--- + drivers/cpufreq/cpufreq_governor.c | 73 +++------ + drivers/cpufreq/cpufreq_governor.h | 24 ++- + drivers/cpufreq/cpufreq_ondemand.c | 40 ++--- + drivers/cpufreq/cpufreq_ondemand.h | 1 - + drivers/cpufreq/cpufreq_performance.c | 19 +-- + drivers/cpufreq/cpufreq_powersave.c | 19 +-- + drivers/cpufreq/cpufreq_stats.c | 157 +++----------------- + drivers/cpufreq/cpufreq_userspace.c | 104 ++++++------- + drivers/cpufreq/davinci-cpufreq.c | 22 +-- + drivers/cpufreq/freq_table.c | 37 +++-- + drivers/cpufreq/powernv-cpufreq.c | 5 +- + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 3 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 33 +---- + drivers/cpufreq/s5pv210-cpufreq.c | 8 +- + drivers/of/of_numa.c | 4 +- + drivers/powercap/intel_rapl.c | 2 +- + drivers/thermal/cpu_cooling.c | 24 ++- + include/acpi/acpi_numa.h | 4 + + include/acpi/processor.h | 1 + + include/linux/acpi.h | 1 - + include/linux/cpufreq.h | 41 +++-- + kernel/sched/cpufreq_schedutil.c | 43 ++---- + 43 files changed, 719 insertions(+), 785 deletions(-) + create mode 100644 arch/arm64/kernel/acpi_numa.c +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (546afd1a3678 Merge branches 'for-rc' and 'thermal-sysfs-locking' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/Makefile | 3 +- + drivers/thermal/thermal_core.c | 1363 +++++++++---------------------------- + drivers/thermal/thermal_core.h | 26 + + drivers/thermal/thermal_helpers.c | 144 ++++ + drivers/thermal/thermal_sysfs.c | 851 +++++++++++++++++++++++ + include/linux/thermal.h | 4 +- + 6 files changed, 1334 insertions(+), 1057 deletions(-) + create mode 100644 drivers/thermal/thermal_helpers.c + create mode 100644 drivers/thermal/thermal_sysfs.c +Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Resolved 'drivers/thermal/rockchip_thermal.c' using previous resolution. +Resolved 'drivers/thermal/tango_thermal.c' using previous resolution. +Auto-merging drivers/thermal/tango_thermal.c +CONFLICT (add/add): Merge conflict in drivers/thermal/tango_thermal.c +Auto-merging drivers/thermal/rockchip_thermal.c +CONFLICT (content): Merge conflict in drivers/thermal/rockchip_thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6d74c9f48b72] Merge remote-tracking branch 'thermal-soc/next' +$ git diff -M --stat --summary HEAD^.. +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (916a890eaff2 Merge branch 'topic/xilinx' into next) +$ git merge slave-dma/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/dma/at_xdmac.c | 86 ++++++++++++------ + drivers/dma/bcm2835-dma.c | 2 +- + drivers/dma/edma.c | 15 ++-- + drivers/dma/mv_xor.c | 12 +-- + drivers/dma/sh/rcar-dmac.c | 2 +- + drivers/dma/sirf-dma.c | 6 +- + drivers/dma/ste_dma40_ll.c | 2 +- + drivers/dma/xilinx/xilinx_vdma.c | 190 +++++++++++++++++++++++++++++++++++++-- + 9 files changed, 263 insertions(+), 53 deletions(-) +Merging net-next/master (99860208bc62 sched: remove NET_XMIT_POLICED) +$ git merge net-next/master +Auto-merging net/sched/sch_prio.c +Auto-merging include/linux/acpi.h +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/80211.tmpl | 1 + + .../bindings/net/brcm,mdio-mux-iproc.txt | 59 + + Documentation/devicetree/bindings/net/dsa/b53.txt | 88 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 278 +- + Documentation/devicetree/bindings/net/mdio-mux.txt | 3 +- + .../bindings/phy/brcm,mdio-mux-bus-pci.txt | 27 + + Documentation/networking/gen_stats.txt | 2 +- + MAINTAINERS | 15 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 328 +- + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 16 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 39 + + arch/arm64/net/bpf_jit.h | 3 +- + arch/arm64/net/bpf_jit_comp.c | 111 +- + drivers/net/bonding/bond_main.c | 22 +- + drivers/net/dsa/Kconfig | 2 + + drivers/net/dsa/Makefile | 2 + + drivers/net/dsa/b53/Kconfig | 33 + + drivers/net/dsa/b53/Makefile | 6 + + drivers/net/dsa/b53/b53_common.c | 1787 +++ + drivers/net/dsa/b53/b53_mdio.c | 392 + + drivers/net/dsa/b53/b53_mmap.c | 260 + + drivers/net/dsa/b53/b53_priv.h | 387 + + drivers/net/dsa/b53/b53_regs.h | 434 + + drivers/net/dsa/b53/b53_spi.c | 331 + + drivers/net/dsa/b53/b53_srab.c | 415 + + drivers/net/dsa/bcm_sf2.c | 701 +- + drivers/net/dsa/bcm_sf2.h | 16 + + drivers/net/dsa/bcm_sf2_regs.h | 70 + + drivers/net/dsa/mv88e6xxx.c | 267 +- + drivers/net/dsa/mv88e6xxx.h | 6 + + drivers/net/ethernet/broadcom/bgmac.c | 135 + + drivers/net/ethernet/broadcom/bgmac.h | 4 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 5 +- + .../ethernet/cavium/liquidio/response_manager.c | 3 +- + drivers/net/ethernet/emulex/benet/be.h | 16 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 147 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 14 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 35 +- + drivers/net/ethernet/emulex/benet/be_main.c | 203 +- + drivers/net/ethernet/freescale/fec_main.c | 7 +- + drivers/net/ethernet/hisilicon/hns/hnae.c | 18 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 247 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 105 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 33 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 250 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h | 7 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 15 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 5 +- + .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c | 10 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 90 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 150 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 25 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed.h | 13 + + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 1347 ++- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 24 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 1623 ++- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 28 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 542 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 8 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 10947 +++++++++++-------- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 12 +- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 184 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 115 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 27 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 57 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 41 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 26 + + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 26 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 40 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 506 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 9 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 95 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 13 +- + drivers/net/ethernet/qlogic/qede/Makefile | 1 + + drivers/net/ethernet/qlogic/qede/qede.h | 3 + + drivers/net/ethernet/qlogic/qede/qede_dcbnl.c | 348 + + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 26 +- + drivers/net/ethernet/renesas/ravb_main.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 14 +- + drivers/net/ethernet/ti/cpsw.c | 3 - + drivers/net/ethernet/wiznet/w5100.c | 3 +- + drivers/net/fjes/fjes_main.c | 5 +- + drivers/net/hyperv/hyperv_net.h | 19 +- + drivers/net/hyperv/netvsc.c | 25 +- + drivers/net/hyperv/netvsc_drv.c | 22 +- + drivers/net/hyperv/rndis_filter.c | 159 +- + drivers/net/ipvlan/ipvlan_main.c | 22 +- + drivers/net/loopback.c | 5 +- + drivers/net/macvlan.c | 59 +- + drivers/net/macvtap.c | 95 +- + drivers/net/phy/Kconfig | 19 + + drivers/net/phy/Makefile | 2 + + drivers/net/phy/intel-xway.c | 376 + + drivers/net/phy/mdio-mux-bcm-iproc.c | 248 + + drivers/net/phy/mdio-mux-gpio.c | 2 +- + drivers/net/phy/mdio-mux-mmioreg.c | 2 +- + drivers/net/phy/mdio-mux.c | 28 +- + drivers/net/ppp/ppp_generic.c | 3 +- + drivers/net/team/team.c | 19 +- + drivers/net/tun.c | 97 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/virtio_net.c | 88 +- + drivers/net/vrf.c | 353 +- + drivers/net/wan/Kconfig | 11 + + drivers/net/wan/Makefile | 1 + + drivers/net/wan/fsl_ucc_hdlc.c | 1192 ++ + drivers/net/wan/fsl_ucc_hdlc.h | 147 + + drivers/net/wireless/mac80211_hwsim.c | 97 +- + drivers/phy/Kconfig | 8 + + drivers/phy/Makefile | 2 +- + drivers/phy/phy-bcm-ns2-pcie.c | 115 + + drivers/soc/fsl/qe/Kconfig | 6 +- + drivers/soc/fsl/qe/Makefile | 1 + + drivers/soc/fsl/qe/qe.c | 6 + + drivers/soc/fsl/qe/qe_tdm.c | 276 + + drivers/soc/fsl/qe/ucc.c | 450 + + drivers/soc/fsl/qe/ucc_fast.c | 36 + + drivers/vhost/net.c | 64 +- + fs/afs/rxrpc.c | 34 +- + include/linux/acpi.h | 13 + + include/linux/bpf.h | 1 + + include/linux/ipv6.h | 7 + + include/linux/mdio-mux.h | 4 +- + include/linux/netdev_features.h | 7 +- + include/linux/netdevice.h | 25 +- + include/linux/platform_data/b53.h | 33 + + include/linux/qed/common_hsi.h | 397 +- + include/linux/qed/eth_common.h | 124 +- + include/linux/qed/iscsi_common.h | 1439 +++ + include/linux/qed/qed_chain.h | 556 +- + include/linux/qed/qed_eth_if.h | 63 + + include/linux/qed/qed_if.h | 158 +- + include/linux/qed/rdma_common.h | 44 + + include/linux/qed/roce_common.h | 17 + + include/linux/qed/storage_common.h | 91 + + include/linux/qed/tcp_common.h | 226 + + include/linux/rxrpc.h | 18 +- + include/linux/skbuff.h | 8 + + include/linux/virtio_net.h | 101 + + include/net/act_api.h | 24 +- + include/net/cfg80211.h | 81 +- + include/net/dsa.h | 56 +- + include/net/fib_rules.h | 24 +- + include/net/gen_stats.h | 12 +- + include/net/l3mdev.h | 12 + + include/net/mac80211.h | 18 +- + include/net/pkt_sched.h | 4 +- + include/net/sch_generic.h | 106 +- + include/net/sctp/sctp.h | 4 + + include/net/sctp/structs.h | 5 + + include/net/tc_act/tc_defact.h | 4 +- + include/net/tcp.h | 2 + + include/net/udp.h | 4 +- + include/soc/fsl/qe/immap_qe.h | 5 +- + include/soc/fsl/qe/qe.h | 19 + + include/soc/fsl/qe/qe_tdm.h | 94 + + include/soc/fsl/qe/ucc.h | 4 + + include/soc/fsl/qe/ucc_fast.h | 27 +- + include/uapi/linux/fib_rules.h | 1 + + include/uapi/linux/nl80211.h | 14 +- + include/uapi/linux/openvswitch.h | 6 + + include/uapi/linux/pkt_cls.h | 7 +- + include/uapi/linux/virtio_net.h | 9 +- + include/uapi/linux/wireless.h | 63 +- + net/batman-adv/routing.c | 2 +- + net/batman-adv/send.c | 4 +- + net/bluetooth/6lowpan.c | 13 +- + net/core/dev.c | 38 +- + net/core/ethtool.c | 1 + + net/core/fib_rules.c | 33 +- + net/core/filter.c | 78 +- + net/core/gen_estimator.c | 24 +- + net/core/gen_stats.c | 35 +- + net/core/pktgen.c | 1 - + net/core/skbuff.c | 46 +- + net/dsa/Makefile | 2 +- + net/dsa/dsa.c | 253 +- + net/dsa/dsa2.c | 690 ++ + net/dsa/dsa_priv.h | 9 +- + net/dsa/slave.c | 80 +- + net/dsa/tag_brcm.c | 4 +- + net/dsa/tag_dsa.c | 10 +- + net/dsa/tag_edsa.c | 10 +- + net/dsa/tag_trailer.c | 4 +- + net/ieee802154/6lowpan/core.c | 15 +- + net/ipv4/Kconfig | 16 + + net/ipv4/Makefile | 1 + + net/ipv4/fib_rules.c | 6 +- + net/ipv4/fou.c | 81 +- + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/tcp_input.c | 31 +- + net/ipv4/tcp_nv.c | 476 + + net/ipv4/tcp_output.c | 4 +- + net/ipv6/af_inet6.c | 6 + + net/ipv6/fib6_rules.c | 6 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/ila/ila.h | 3 +- + net/ipv6/ila/ila_common.c | 6 +- + net/ipv6/ila/ila_lwt.c | 4 +- + net/ipv6/ila/ila_xlat.c | 8 +- + net/ipv6/ip6_input.c | 1 + + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ping.c | 4 +- + net/ipv6/raw.c | 8 +- + net/ipv6/route.c | 2 + + net/ipv6/sit.c | 3 - + net/ipv6/udp.c | 8 +- + net/l2tp/l2tp_eth.c | 4 +- + net/l2tp/l2tp_ip6.c | 8 +- + net/l3mdev/l3mdev.c | 38 + + net/mac80211/agg-tx.c | 8 +- + net/mac80211/debugfs.c | 173 + + net/mac80211/debugfs_sta.c | 78 +- + net/mac80211/ieee80211_i.h | 31 +- + net/mac80211/iface.c | 26 +- + net/mac80211/main.c | 10 +- + net/mac80211/rx.c | 2 +- + net/mac80211/sta_info.c | 14 +- + net/mac80211/tx.c | 292 +- + net/mac80211/util.c | 34 +- + net/mpls/af_mpls.c | 2 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netlink/af_netlink.h | 14 - + net/openvswitch/actions.c | 40 +- + net/openvswitch/datapath.c | 29 +- + net/openvswitch/datapath.h | 5 +- + net/openvswitch/flow_netlink.c | 9 + + net/openvswitch/vport-internal_dev.c | 2 +- + net/openvswitch/vport.c | 1 + + net/packet/af_packet.c | 36 +- + net/rds/ib_rdma.c | 2 +- + net/rxrpc/af_rxrpc.c | 212 +- + net/rxrpc/ar-accept.c | 2 + + net/rxrpc/ar-ack.c | 2 + + net/rxrpc/ar-call.c | 170 +- + net/rxrpc/ar-connection.c | 19 +- + net/rxrpc/ar-connevent.c | 2 + + net/rxrpc/ar-input.c | 4 +- + net/rxrpc/ar-internal.h | 53 +- + net/rxrpc/ar-key.c | 4 +- + net/rxrpc/ar-local.c | 4 +- + net/rxrpc/ar-output.c | 188 +- + net/rxrpc/ar-peer.c | 2 + + net/rxrpc/ar-recvmsg.c | 4 +- + net/rxrpc/ar-skbuff.c | 2 + + net/rxrpc/ar-transport.c | 2 + + net/rxrpc/misc.c | 6 + + net/rxrpc/rxkad.c | 2 + + net/rxrpc/sysctl.c | 10 + + net/sched/act_api.c | 24 +- + net/sched/act_bpf.c | 8 +- + net/sched/act_connmark.c | 6 +- + net/sched/act_csum.c | 7 +- + net/sched/act_gact.c | 7 +- + net/sched/act_ife.c | 10 +- + net/sched/act_ipt.c | 14 +- + net/sched/act_mirred.c | 6 +- + net/sched/act_nat.c | 7 +- + net/sched/act_pedit.c | 8 +- + net/sched/act_police.c | 4 +- + net/sched/act_simple.c | 7 +- + net/sched/act_skbedit.c | 7 +- + net/sched/act_vlan.c | 9 +- + net/sched/cls_api.c | 48 +- + net/sched/cls_flower.c | 31 +- + net/sched/sch_api.c | 30 +- + net/sched/sch_atm.c | 20 +- + net/sched/sch_cbq.c | 298 +- + net/sched/sch_choke.c | 17 - + net/sched/sch_drr.c | 31 +- + net/sched/sch_dsmark.c | 18 - + net/sched/sch_fifo.c | 7 +- + net/sched/sch_fq.c | 3 +- + net/sched/sch_fq_codel.c | 25 +- + net/sched/sch_generic.c | 10 +- + net/sched/sch_gred.c | 35 - + net/sched/sch_hfsc.c | 38 +- + net/sched/sch_hhf.c | 10 - + net/sched/sch_htb.c | 40 +- + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 11 +- + net/sched/sch_multiq.c | 25 +- + net/sched/sch_netem.c | 38 +- + net/sched/sch_plug.c | 16 +- + net/sched/sch_prio.c | 23 +- + net/sched/sch_qfq.c | 56 +- + net/sched/sch_red.c | 21 - + net/sched/sch_sfq.c | 1 - + net/sched/sch_tbf.c | 22 +- + net/sctp/Makefile | 3 +- + net/sctp/input.c | 57 +- + net/sctp/inqueue.c | 78 +- + net/sctp/offload.c | 98 + + net/sctp/output.c | 366 +- + net/sctp/protocol.c | 3 + + net/sctp/sm_sideeffect.c | 4 +- + net/sctp/socket.c | 10 +- + net/tipc/link.c | 2 - + net/tipc/node.c | 22 +- + net/wireless/core.c | 30 + + net/wireless/core.h | 4 +- + net/wireless/nl80211.c | 232 +- + net/wireless/nl80211.h | 2 +- + net/wireless/sme.c | 8 +- + 319 files changed, 28560 insertions(+), 8773 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt + create mode 100644 drivers/net/dsa/b53/Kconfig + create mode 100644 drivers/net/dsa/b53/Makefile + create mode 100644 drivers/net/dsa/b53/b53_common.c + create mode 100644 drivers/net/dsa/b53/b53_mdio.c + create mode 100644 drivers/net/dsa/b53/b53_mmap.c + create mode 100644 drivers/net/dsa/b53/b53_priv.h + create mode 100644 drivers/net/dsa/b53/b53_regs.h + create mode 100644 drivers/net/dsa/b53/b53_spi.c + create mode 100644 drivers/net/dsa/b53/b53_srab.c + create mode 100644 drivers/net/ethernet/qlogic/qede/qede_dcbnl.c + create mode 100644 drivers/net/phy/intel-xway.c + create mode 100644 drivers/net/phy/mdio-mux-bcm-iproc.c + create mode 100644 drivers/net/wan/fsl_ucc_hdlc.c + create mode 100644 drivers/net/wan/fsl_ucc_hdlc.h + create mode 100644 drivers/phy/phy-bcm-ns2-pcie.c + create mode 100644 drivers/soc/fsl/qe/qe_tdm.c + create mode 100644 include/linux/platform_data/b53.h + create mode 100644 include/linux/qed/iscsi_common.h + create mode 100644 include/linux/qed/rdma_common.h + create mode 100644 include/linux/qed/roce_common.h + create mode 100644 include/linux/qed/storage_common.h + create mode 100644 include/linux/qed/tcp_common.h + create mode 100644 include/linux/virtio_net.h + create mode 100644 include/soc/fsl/qe/qe_tdm.h + create mode 100644 net/dsa/dsa2.c + create mode 100644 net/ipv4/tcp_nv.c + create mode 100644 net/sctp/offload.c +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (625b44fc15f8 ipvs: count pre-established TCP states as active) +$ git merge ipvs-next/master +Auto-merging net/netfilter/nf_conntrack_helper.c +Merge made by the 'recursive' strategy. + net/bridge/netfilter/ebt_stp.c | 40 +++++++++++------------ + net/netfilter/ipvs/ip_vs_proto_tcp.c | 25 +++++++++++++-- + net/netfilter/nf_conntrack_helper.c | 61 +++++++++++++++++++----------------- + 3 files changed, 75 insertions(+), 51 deletions(-) +Merging wireless-drivers-next/master (d02fb8f14b2d brcmfmac: rework function picking free BSS index) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/carl9170/Kconfig | 8 ++-- + drivers/net/wireless/broadcom/b43/xmit.c | 13 ++++-- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 47 +++++++++++++--------- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 17 +++++++- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 24 ----------- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 1 - + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 3 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- + 8 files changed, 60 insertions(+), 55 deletions(-) +Merging bluetooth/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle') +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (e69f73bfecb0 Merge branch 'remove-qdisc-throttle') +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (61c78eea9516 IB/IPoIB: Don't update neigh validity for unresolved entries) +$ git merge rdma/for-next +Already up-to-date. +Merging rdma-leon/rdma-next (5edb56491d48 Linux 4.7-rc3) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (db6066bcf465 Merge branch 'topic/rxe' into testing/rdma-next) +$ git merge rdma-leon-test/testing/rdma-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/uverbs.h | 13 + + drivers/infiniband/core/uverbs_cmd.c | 537 +++++++- + drivers/infiniband/core/uverbs_main.c | 38 + + drivers/infiniband/core/verbs.c | 163 ++- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/mlx5/cq.c | 87 +- + drivers/infiniband/hw/mlx5/main.c | 408 +++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 74 ++ + drivers/infiniband/hw/mlx5/mr.c | 4 + + drivers/infiniband/hw/mlx5/qp.c | 691 +++++++++- + drivers/infiniband/hw/mlx5/srq.c | 112 +- + drivers/infiniband/hw/mlx5/user.h | 88 +- + drivers/infiniband/hw/rxe/Kconfig | 24 + + drivers/infiniband/hw/rxe/Makefile | 24 + + drivers/infiniband/hw/rxe/rxe.c | 455 +++++++ + drivers/infiniband/hw/rxe/rxe.h | 74 ++ + drivers/infiniband/hw/rxe/rxe_av.c | 98 ++ + drivers/infiniband/hw/rxe/rxe_comp.c | 734 +++++++++++ + drivers/infiniband/hw/rxe/rxe_cq.c | 165 +++ + drivers/infiniband/hw/rxe/rxe_dma.c | 166 +++ + drivers/infiniband/hw/rxe/rxe_hdr.h | 952 ++++++++++++++ + drivers/infiniband/hw/rxe/rxe_icrc.c | 96 ++ + drivers/infiniband/hw/rxe/rxe_loc.h | 289 +++++ + drivers/infiniband/hw/rxe/rxe_mcast.c | 190 +++ + drivers/infiniband/hw/rxe/rxe_mmap.c | 173 +++ + drivers/infiniband/hw/rxe/rxe_mr.c | 679 ++++++++++ + drivers/infiniband/hw/rxe/rxe_net.c | 753 +++++++++++ + drivers/infiniband/hw/rxe/rxe_net.h | 78 ++ + drivers/infiniband/hw/rxe/rxe_opcode.c | 961 ++++++++++++++ + drivers/infiniband/hw/rxe/rxe_opcode.h | 128 ++ + drivers/infiniband/hw/rxe/rxe_param.h | 173 +++ + drivers/infiniband/hw/rxe/rxe_pool.c | 510 ++++++++ + drivers/infiniband/hw/rxe/rxe_pool.h | 164 +++ + drivers/infiniband/hw/rxe/rxe_qp.c | 851 ++++++++++++ + drivers/infiniband/hw/rxe/rxe_queue.c | 217 ++++ + drivers/infiniband/hw/rxe/rxe_queue.h | 178 +++ + drivers/infiniband/hw/rxe/rxe_recv.c | 420 ++++++ + drivers/infiniband/hw/rxe/rxe_req.c | 675 ++++++++++ + drivers/infiniband/hw/rxe/rxe_resp.c | 1364 ++++++++++++++++++++ + drivers/infiniband/hw/rxe/rxe_srq.c | 193 +++ + drivers/infiniband/hw/rxe/rxe_sysfs.c | 151 +++ + drivers/infiniband/hw/rxe/rxe_task.c | 154 +++ + drivers/infiniband/hw/rxe/rxe_task.h | 95 ++ + drivers/infiniband/hw/rxe/rxe_verbs.c | 1352 +++++++++++++++++++ + drivers/infiniband/hw/rxe/rxe_verbs.h | 486 +++++++ + drivers/net/ethernet/mellanox/mlx5/core/srq.c | 265 ++-- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 4 + + include/linux/mlx5/cq.h | 2 + + include/linux/mlx5/driver.h | 6 +- + include/linux/mlx5/mlx5_ifc.h | 275 +++- + include/linux/mlx5/qp.h | 4 +- + include/linux/mlx5/srq.h | 25 + + include/rdma/ib_verbs.h | 99 +- + include/uapi/rdma/Kbuild | 1 + + include/uapi/rdma/ib_rxe.h | 139 ++ + include/uapi/rdma/ib_user_verbs.h | 95 ++ + 58 files changed, 15916 insertions(+), 247 deletions(-) + create mode 100644 drivers/infiniband/hw/rxe/Kconfig + create mode 100644 drivers/infiniband/hw/rxe/Makefile + create mode 100644 drivers/infiniband/hw/rxe/rxe.c + create mode 100644 drivers/infiniband/hw/rxe/rxe.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_av.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_comp.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_cq.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_dma.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_hdr.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_icrc.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_loc.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_mcast.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_mmap.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_mr.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_net.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_net.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_opcode.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_opcode.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_param.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_pool.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_pool.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_qp.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_queue.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_queue.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_recv.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_req.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_resp.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_srq.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_sysfs.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_task.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_task.h + create mode 100644 drivers/infiniband/hw/rxe/rxe_verbs.c + create mode 100644 drivers/infiniband/hw/rxe/rxe_verbs.h + create mode 100644 include/uapi/rdma/ib_rxe.h +Merging mtd/master (becc7ae544c6 MAINTAINERS: Add file patterns for mtd device tree bindings) +$ git merge mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging l2-mtd/master (95193796256c mtd: m25p80: read in spi_max_transfer_size chunks) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 37 +++++++++----- + drivers/mtd/spi-nor/fsl-quadspi.c | 29 +++++------ + drivers/mtd/spi-nor/mtk-quadspi.c | 42 +++++++++------- + drivers/mtd/spi-nor/nxp-spifi.c | 25 +++++----- + drivers/mtd/spi-nor/spi-nor.c | 100 +++++++++++++++++++++++++------------- + include/linux/mtd/spi-nor.h | 8 +-- + 6 files changed, 148 insertions(+), 93 deletions(-) +Merging nand/nand/next (e2442baf99bc mtd: nand: sunxi: fix return value check in sunxi_nfc_dma_op_prepare()) +$ git merge nand/nand/next +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/omap-gpmc.txt | 7 +- + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 2 +- + .../devicetree/bindings/mtd/sunxi-nand.txt | 4 + + drivers/mtd/nand/brcmnand/brcmnand.c | 171 ++++++++++- + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/omap2.c | 7 +- + drivers/mtd/nand/sunxi_nand.c | 330 ++++++++++++++++++++- + include/linux/mtd/nand.h | 1 + + 9 files changed, 496 insertions(+), 28 deletions(-) +Merging crypto/master (e434cd2dc4de ARM64: dts: meson-gxbb: Add Hardware Random Generator node) +$ git merge crypto/master +Recorded preimage for 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi' +Auto-merging arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi'. +[master f25c94f08af2] Merge remote-tracking branch 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/crypto/asymmetric-keys.txt | 2 +- + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 14 + + .../devicetree/bindings/rng/brcm,bcm2835.txt | 7 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/bcm-nsp.dtsi | 5 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 43 ++ + arch/arm64/include/asm/io.h | 4 +- + arch/powerpc/crypto/aes-spe-regs.h | 2 +- + arch/powerpc/kernel/iomap.c | 24 + + arch/x86/crypto/sha-mb/sha1_mb.c | 110 ++-- + arch/x86/crypto/sha1_ssse3_glue.c | 6 + + arch/x86/crypto/sha256_ssse3_glue.c | 10 + + arch/x86/crypto/sha512_ssse3_glue.c | 6 + + crypto/ablkcipher.c | 1 - + crypto/crypto_user.c | 10 +- + crypto/drbg.c | 33 +- + drivers/char/hw_random/Kconfig | 16 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/bcm2835-rng.c | 46 +- + drivers/char/hw_random/exynos-rng.c | 4 +- + drivers/char/hw_random/meson-rng.c | 131 ++++ + drivers/char/hw_random/stm32-rng.c | 10 +- + drivers/crypto/caam/Kconfig | 6 +- + drivers/crypto/caam/caamhash.c | 5 +- + drivers/crypto/caam/ctrl.c | 125 ++-- + drivers/crypto/caam/desc.h | 9 +- + drivers/crypto/caam/desc_constr.h | 44 +- + drivers/crypto/caam/jr.c | 22 +- + drivers/crypto/caam/pdb.h | 137 ++++- + drivers/crypto/caam/regs.h | 151 +++-- + drivers/crypto/caam/sg_sw_sec4.h | 17 +- + drivers/crypto/omap-aes.c | 18 +- + drivers/crypto/qat/qat_common/adf_aer.c | 3 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 2 +- + drivers/crypto/qat/qat_common/adf_vf_isr.c | 2 +- + drivers/crypto/qat/qat_common/qat_algs.c | 8 +- + drivers/crypto/s5p-sss.c | 80 +-- + drivers/crypto/talitos.c | 672 +++++++++++++-------- + drivers/usb/misc/Kconfig | 11 +- + drivers/usb/misc/chaoskey.c | 21 +- + include/asm-generic/io.h | 71 ++- + include/asm-generic/iomap.h | 8 + + include/linux/crypto.h | 10 +- + include/linux/mpi.h | 1 - + lib/digsig.c | 16 +- + lib/mpi/mpicoder.c | 126 +--- + 48 files changed, 1387 insertions(+), 674 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt + create mode 100644 drivers/char/hw_random/meson-rng.c +Merging drm/drm-next (3c85f20a289d Merge tag 'omapdrm-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next) +$ git merge drm/drm-next +Recorded preimage for 'drivers/gpu/drm/i915/intel_display.c' +Auto-merging include/video/omapfb_dss.h +Auto-merging drivers/gpu/drm/vc4/vc4_kms.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi5.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dsi.c +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_vbt_defs.h +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dpll_mgr.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +Auto-merging drivers/gpu/drm/armada/armada_drv.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/intel_display.c'. +[master 416cbb2170d5] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 4 + + Documentation/DocBook/gpu.tmpl | 27 +- + .../bindings/display/panel/panel-dpi.txt | 2 + + MAINTAINERS | 18 + + arch/x86/kernel/early-quirks.c | 404 +++-- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/fence-array.c | 144 ++ + drivers/dma-buf/fence.c | 8 +- + drivers/dma-buf/sync_file.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 12 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 4 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 19 - + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 14 +- + drivers/gpu/drm/armada/armada_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_fb.c | 3 - + drivers/gpu/drm/ast/ast_mode.c | 10 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/bochs/bochs_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 11 +- + drivers/gpu/drm/drm_atomic.c | 80 +- + drivers/gpu/drm/drm_atomic_helper.c | 79 +- + drivers/gpu/drm/drm_bridge.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 162 +- + drivers/gpu/drm/drm_crtc_helper.c | 33 - + drivers/gpu/drm/drm_edid_load.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 27 +- + drivers/gpu/drm/drm_fb_helper.c | 48 +- + drivers/gpu/drm/drm_fops.c | 18 +- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_irq.c | 133 +- + drivers/gpu/drm/drm_mipi_dsi.c | 22 + + drivers/gpu/drm/drm_mm.c | 4 +- + drivers/gpu/drm/drm_modes.c | 4 +- + drivers/gpu/drm/drm_modeset_lock.c | 13 +- + drivers/gpu/drm/drm_plane_helper.c | 10 +- + drivers/gpu/drm/drm_probe_helper.c | 21 +- + drivers/gpu/drm/drm_vma_manager.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 9 +- + drivers/gpu/drm/gma500/gma_display.h | 4 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 7 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- + drivers/gpu/drm/i915/Makefile | 3 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 44 +- + drivers/gpu/drm/i915/i915_debugfs.c | 167 +- + drivers/gpu/drm/i915/i915_dma.c | 132 +- + drivers/gpu/drm/i915/i915_drv.c | 129 +- + drivers/gpu/drm/i915/i915_drv.h | 405 +++-- + drivers/gpu/drm/i915/i915_gem.c | 417 ++--- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 6 +- + drivers/gpu/drm/i915/i915_gem_context.c | 464 +++--- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 26 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 14 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 239 +-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 39 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 17 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 48 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 12 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 81 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 6 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 174 +- + drivers/gpu/drm/i915/i915_irq.c | 515 +++--- + drivers/gpu/drm/i915/i915_params.c | 18 +- + drivers/gpu/drm/i915/i915_params.h | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 21 +- + drivers/gpu/drm/i915/i915_sysfs.c | 11 +- + drivers/gpu/drm/i915/i915_trace.h | 48 +- + drivers/gpu/drm/i915/i915_vgpu.c | 31 +- + drivers/gpu/drm/i915/i915_vgpu.h | 2 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_audio.c | 8 +- + drivers/gpu/drm/i915/intel_bios.c | 21 +- + drivers/gpu/drm/i915/intel_bios.h | 16 +- + drivers/gpu/drm/i915/intel_color.c | 3 +- + drivers/gpu/drm/i915/intel_crt.c | 2 +- + drivers/gpu/drm/i915/intel_csr.c | 30 +- + drivers/gpu/drm/i915/intel_ddi.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 1681 +++++++++++--------- + drivers/gpu/drm/i915/intel_dp.c | 467 +----- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 172 ++ + drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 470 ++++++ + drivers/gpu/drm/i915/intel_dpll_mgr.c | 37 +- + drivers/gpu/drm/i915/intel_drv.h | 193 ++- + drivers/gpu/drm/i915/intel_dsi.c | 51 +- + drivers/gpu/drm/i915/intel_dsi.h | 4 + + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 179 +++ + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 77 +- + drivers/gpu/drm/i915/intel_dvo.c | 18 +- + drivers/gpu/drm/i915/intel_fbc.c | 7 +- + drivers/gpu/drm/i915/intel_fbdev.c | 39 +- + drivers/gpu/drm/i915/intel_guc.h | 37 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 3 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 179 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 354 +---- + drivers/gpu/drm/i915/intel_hotplug.c | 13 +- + drivers/gpu/drm/i915/intel_lrc.c | 704 ++++---- + drivers/gpu/drm/i915/intel_lrc.h | 19 +- + drivers/gpu/drm/i915/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 109 +- + drivers/gpu/drm/i915/intel_overlay.c | 147 +- + drivers/gpu/drm/i915/intel_panel.c | 8 + + drivers/gpu/drm/i915/intel_pm.c | 1189 ++++++++------ + drivers/gpu/drm/i915/intel_psr.c | 53 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 476 +++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 41 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 61 +- + drivers/gpu/drm/i915/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/intel_sprite.c | 43 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 221 ++- + drivers/gpu/drm/i915/intel_vbt_defs.h | 6 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 9 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 20 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 12 +- + drivers/gpu/drm/msm/msm_atomic.c | 37 +- + drivers/gpu/drm/msm/msm_fb.c | 8 - + drivers/gpu/drm/msm/msm_fbdev.c | 14 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 1 - + drivers/gpu/drm/nouveau/nv50_display.c | 9 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 28 +- + drivers/gpu/drm/omapdrm/displays/Makefile | 28 +- + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 11 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 4 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 4 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 3 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 3 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 3 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 26 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 4 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 22 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 4 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 3 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 3 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 5 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 471 +++++- + drivers/gpu/drm/omapdrm/dss/dispc.h | 5 + + drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 2 +- + drivers/gpu/drm/omapdrm/dss/display.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 136 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 57 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 3 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 255 ++- + drivers/gpu/drm/omapdrm/dss/dss.h | 45 +- + drivers/gpu/drm/omapdrm/dss/dss_features.c | 46 +- + drivers/gpu/drm/omapdrm/dss/dss_features.h | 1 - + drivers/gpu/drm/omapdrm/dss/hdmi.h | 6 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 11 +- + drivers/gpu/drm/omapdrm/dss/hdmi_common.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 78 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 871 +++++++++- + drivers/gpu/drm/omapdrm/dss/output.c | 3 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 129 +- + drivers/gpu/drm/omapdrm/dss/rfbi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 2 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 3 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 9 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 56 + + drivers/gpu/drm/omapdrm/omap_drv.c | 13 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 14 - + drivers/gpu/drm/omapdrm/omap_fb.c | 16 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 5 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 15 +- + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 4 - + drivers/gpu/drm/qxl/qxl_release.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 17 +- + drivers/gpu/drm/radeon/radeon_drv.c | 10 +- + drivers/gpu/drm/radeon/radeon_pm.c | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 4 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 7 - + drivers/gpu/drm/sti/sti_drv.c | 8 +- + drivers/gpu/drm/sti/sti_dvo.c | 7 - + drivers/gpu/drm/sti/sti_gdp.c | 14 - + drivers/gpu/drm/sti/sti_hda.c | 7 - + drivers/gpu/drm/sti/sti_hdmi.c | 7 - + drivers/gpu/drm/sti/sti_hqvdp.c | 7 - + drivers/gpu/drm/sti/sti_mixer.c | 7 - + drivers/gpu/drm/sti/sti_tvout.c | 7 - + drivers/gpu/drm/sti/sti_vid.c | 7 - + drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 - + drivers/gpu/drm/vc4/vc4_crtc.c | 21 +- + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/vc4/vc4_kms.c | 10 +- + drivers/gpu/drm/vc4/vc4_plane.c | 5 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 126 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 150 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/vga/vga_switcheroo.c | 34 +- + drivers/media/platform/omap/omap_vout.c | 2 +- + drivers/media/platform/omap/omap_voutdef.h | 2 +- + drivers/media/platform/omap/omap_voutlib.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/pd.c | 4 +- + drivers/staging/android/sync.h | 3 +- + .../omap2/omapfb/displays/connector-analog-tv.c | 10 +- + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 60 +- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 44 +- + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 2 +- + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 46 +- + .../omap2/omapfb/displays/encoder-tpd12s015.c | 3 +- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 2 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 54 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 58 +- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 47 +- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 83 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 45 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 46 +- + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/core.c | 4 +- + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/display.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 11 + + .../video/fbdev/omap2/omapfb/dss/dss_features.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 3 +- + drivers/video/fbdev/omap2/omapfb/dss/output.c | 2 +- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 2 +- + drivers/video/fbdev/omap2/omapfb/omapfb.h | 2 +- + include/drm/drmP.h | 28 +- + include/drm/drm_atomic.h | 66 +- + include/drm/drm_atomic_helper.h | 30 +- + include/drm/drm_crtc.h | 168 +- + include/drm/drm_crtc_helper.h | 3 - + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_mipi_dsi.h | 1 + + include/drm/drm_modes.h | 2 + + include/drm/drm_modeset_helper_vtables.h | 10 +- + include/drm/i915_drm.h | 3 + + include/linux/fence-array.h | 73 + + include/linux/fence.h | 13 +- + include/linux/io-mapping.h | 10 +- + include/linux/platform_data/omapdss.h | 5 - + include/linux/vga_switcheroo.h | 2 + + include/sound/omap-hdmi-audio.h | 9 +- + include/video/omap-panel-data.h | 157 -- + include/video/{omapdss.h => omapfb_dss.h} | 49 +- + sound/soc/omap/omap-hdmi-audio.c | 1 - + 305 files changed, 9110 insertions(+), 6944 deletions(-) + create mode 100644 drivers/dma-buf/fence-array.c + create mode 100644 drivers/gpu/drm/i915/intel_dp_aux_backlight.c + create mode 100644 drivers/gpu/drm/i915/intel_dpio_phy.c + create mode 100644 drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c + create mode 100644 include/linux/fence-array.h + rename include/video/{omapdss.h => omapfb_dss.h} (94%) +Merging drm-panel/drm/panel/for-next (f103b93d90c2 drm/dsi: Add uevent callback) +$ git merge drm-panel/drm/panel/for-next +Auto-merging include/drm/drm_mipi_dsi.h +Auto-merging drivers/gpu/drm/drm_mipi_dsi.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_mipi_dsi.c | 16 ++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 9 ++++----- + include/drm/drm_mipi_dsi.h | 2 ++ + 3 files changed, 22 insertions(+), 5 deletions(-) +Merging drm-intel/for-linux-next (beffa5176fa2 drm/i915/guc: prefer 'dev_priv' to 'dev' for intra-module functions) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_vgpu.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'recursive' strategy. + drivers/char/agp/intel-gtt.c | 8 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 9 +- + drivers/gpu/drm/i915/i915_drv.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 26 ++ + drivers/gpu/drm/i915/i915_gem.c | 366 ++++++++++++++++++++++++----- + drivers/gpu/drm/i915/i915_gem_gtt.c | 66 +++++- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 6 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 66 +++--- + drivers/gpu/drm/i915/i915_irq.c | 7 +- + drivers/gpu/drm/i915/i915_params.c | 8 +- + drivers/gpu/drm/i915/i915_reg.h | 40 ++++ + drivers/gpu/drm/i915/i915_vgpu.c | 4 +- + drivers/gpu/drm/i915/intel_ddi.c | 212 +++++++++-------- + drivers/gpu/drm/i915/intel_display.c | 84 +++---- + drivers/gpu/drm/i915/intel_drv.h | 19 +- + drivers/gpu/drm/i915/intel_dsi.c | 6 + + drivers/gpu/drm/i915/intel_fbdev.c | 2 - + drivers/gpu/drm/i915/intel_guc.h | 8 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 37 +-- + drivers/gpu/drm/i915/intel_lrc.c | 77 ++++-- + drivers/gpu/drm/i915/intel_mocs.c | 10 + + drivers/gpu/drm/i915/intel_pm.c | 67 +++++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 155 ++++++++---- + drivers/gpu/drm/i915/intel_runtime_pm.c | 144 ++++++++++-- + include/drm/intel-gtt.h | 3 + + 26 files changed, 1073 insertions(+), 368 deletions(-) +Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (c02726ffea2d drm/gma500: use drm_crtc_vblank_{on,off}()) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/vc4/vc4_kms.c +Auto-merging drivers/gpu/drm/vc4/vc4_dpi.c +Auto-merging drivers/gpu/drm/sti/sti_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/arm/hdlcd_drv.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 11 + + drivers/gpu/drm/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- + drivers/gpu/drm/arc/arcpgu.h | 1 - + drivers/gpu/drm/arc/arcpgu_crtc.c | 16 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 27 +- + drivers/gpu/drm/arc/arcpgu_hdmi.c | 18 - + drivers/gpu/drm/arm/hdlcd_drv.c | 8 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 12 - + drivers/gpu/drm/bridge/analogix-anx78xx.c | 8 - + drivers/gpu/drm/bridge/dw-hdmi.c | 11 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 8 - + drivers/gpu/drm/bridge/parade-ps8622.c | 10 - + drivers/gpu/drm/drm_atomic.c | 22 + + drivers/gpu/drm/drm_atomic_helper.c | 493 +++++++++++++++++++-- + drivers/gpu/drm/drm_crtc.c | 292 +----------- + drivers/gpu/drm/drm_drv.c | 2 - + drivers/gpu/drm/drm_fb_cma_helper.c | 1 + + drivers/gpu/drm/drm_fb_helper.c | 6 +- + drivers/gpu/drm/drm_fops.c | 6 + + drivers/gpu/drm/drm_fourcc.c | 320 +++++++++++++ + drivers/gpu/drm/drm_irq.c | 80 +--- + drivers/gpu/drm/drm_prime.c | 10 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 205 +++++++++ + drivers/gpu/drm/drm_sysfs.c | 71 --- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 9 - + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 8 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 23 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 9 - + drivers/gpu/drm/gma500/gma_display.c | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 20 +- + drivers/gpu/drm/i915/intel_crt.c | 1 - + drivers/gpu/drm/i915/intel_display.c | 10 +- + drivers/gpu/drm/i915/intel_dp.c | 1 - + drivers/gpu/drm/i915/intel_drv.h | 1 - + drivers/gpu/drm/i915/intel_dsi.c | 1 - + drivers/gpu/drm/i915/intel_dvo.c | 1 - + drivers/gpu/drm/i915/intel_fbdev.c | 2 - + drivers/gpu/drm/i915/intel_hdmi.c | 1 - + drivers/gpu/drm/i915/intel_lvds.c | 1 - + drivers/gpu/drm/i915/intel_sdvo.c | 1 - + drivers/gpu/drm/i915/intel_tv.c | 1 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 9 - + drivers/gpu/drm/msm/edp/edp_connector.c | 10 - + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 8 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 9 - + drivers/gpu/drm/msm/msm_atomic.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 10 - + drivers/gpu/drm/omapdrm/omap_drv.c | 2 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 4 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 12 - + drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 3 - + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 3 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 15 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 - + drivers/gpu/drm/rockchip/inno_hdmi.c | 9 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 194 +++----- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 12 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 72 +-- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 68 +-- + drivers/gpu/drm/sti/sti_drv.c | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 10 - + drivers/gpu/drm/sti/sti_hda.c | 10 - + drivers/gpu/drm/sti/sti_hdmi.c | 10 - + drivers/gpu/drm/sun4i/sun4i_crtc.c | 12 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 10 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 9 - + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/drm/tegra/drm.h | 2 - + drivers/gpu/drm/tegra/dsi.c | 1 - + drivers/gpu/drm/tegra/hdmi.c | 1 - + drivers/gpu/drm/tegra/output.c | 8 - + drivers/gpu/drm/tegra/rgb.c | 1 - + drivers/gpu/drm/tegra/sor.c | 1 - + drivers/gpu/drm/vc4/vc4_dpi.c | 9 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 9 - + drivers/gpu/drm/vc4/vc4_kms.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 12 +- + include/drm/drmP.h | 10 +- + include/drm/drm_atomic.h | 16 + + include/drm/drm_atomic_helper.h | 14 +- + include/drm/drm_crtc.h | 161 ++++++- + include/drm/drm_fb_helper.h | 11 - + include/drm/drm_fourcc.h | 37 ++ + include/drm/drm_modeset_helper_vtables.h | 39 ++ + include/drm/drm_simple_kms_helper.h | 94 ++++ + 104 files changed, 1577 insertions(+), 1183 deletions(-) + create mode 100644 drivers/gpu/drm/drm_fourcc.c + create mode 100644 drivers/gpu/drm/drm_simple_kms_helper.c + create mode 100644 include/drm/drm_fourcc.h + create mode 100644 include/drm/drm_simple_kms_helper.h +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (f6c68b4bd4a9 drm: hdlcd: Add information about the underlying framebuffers in debugfs) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging sunxi/sunxi/for-next (ac17bf0c25e3 Merge branches 'sunxi/clk-fixes-for-4.7' and 'sunxi/dt-for-4.8' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/gpu/drm/sun4i/sun4i_rgb.c +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/axp209.dtsi | 1 + + arch/arm/boot/dts/axp809.dtsi | 53 +++ + arch/arm/boot/dts/sun4i-a10-a1000.dts | 1 + + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 1 + + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 1 + + arch/arm/boot/dts/sun4i-a10.dtsi | 209 ++++++++---- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 7 + + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 10 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 14 + + arch/arm/boot/dts/sun5i-a13.dtsi | 122 +++++++ + arch/arm/boot/dts/sun5i-q8-common.dtsi | 55 +++ + arch/arm/boot/dts/sun5i-r8.dtsi | 120 +------ + arch/arm/boot/dts/sun7i-a20.dtsi | 371 +++++++++++++-------- + .../arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts | 195 +++++++++++ + arch/arm/boot/dts/sun8i-h3.dtsi | 21 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 132 +++++++- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 149 ++++++++- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 2 + + drivers/clk/sunxi/clk-sun4i-display.c | 5 +- + drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 3 - + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 39 ++- + drivers/gpu/drm/sun4i/sun4i_drv.c | 50 ++- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 23 +- + 28 files changed, 1212 insertions(+), 398 deletions(-) + create mode 100644 arch/arm/boot/dts/axp809.dtsi + create mode 100644 arch/arm/boot/dts/sun8i-h3-sinovoip-bpi-m2-plus.dts +Merging kbuild/for-next (3f306a53b571 Merge branch 'kbuild/rc-fixes' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .gitignore | 1 + + Documentation/dontdiff | 1 + + Documentation/gcc-plugins.txt | 87 +++ + MAINTAINERS | 9 + + Makefile | 24 +- + arch/Kconfig | 36 + + arch/arm/Kconfig | 1 + + arch/arm64/Kconfig | 1 + + arch/um/Kconfig.common | 1 + + arch/x86/Kconfig | 1 + + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/purgatory/Makefile | 2 + + lib/Kconfig.debug | 2 + + scripts/Makefile | 2 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.clean | 4 +- + scripts/Makefile.gcc-plugins | 43 ++ + scripts/Makefile.host | 55 +- + scripts/gcc-plugin.sh | 51 ++ + scripts/gcc-plugins/Makefile | 27 + + scripts/gcc-plugins/cyc_complexity_plugin.c | 73 ++ + scripts/gcc-plugins/gcc-common.h | 830 +++++++++++++++++++++ + scripts/gcc-plugins/gcc-generate-gimple-pass.h | 175 +++++ + scripts/gcc-plugins/gcc-generate-ipa-pass.h | 289 +++++++ + scripts/gcc-plugins/gcc-generate-rtl-pass.h | 175 +++++ + scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h | 175 +++++ + scripts/gcc-plugins/sancov_plugin.c | 144 ++++ + scripts/link-vmlinux.sh | 2 +- + scripts/package/builddeb | 1 + + 29 files changed, 2200 insertions(+), 17 deletions(-) + create mode 100644 Documentation/gcc-plugins.txt + create mode 100644 scripts/Makefile.gcc-plugins + create mode 100755 scripts/gcc-plugin.sh + create mode 100644 scripts/gcc-plugins/Makefile + create mode 100644 scripts/gcc-plugins/cyc_complexity_plugin.c + create mode 100644 scripts/gcc-plugins/gcc-common.h + create mode 100644 scripts/gcc-plugins/gcc-generate-gimple-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-ipa-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-rtl-pass.h + create mode 100644 scripts/gcc-plugins/gcc-generate-simple_ipa-pass.h + create mode 100644 scripts/gcc-plugins/sancov_plugin.c +$ git am -3 ../patches/0001-gcc-plugins-disable-under-COMPILE_TEST.patch +Applying: gcc-plugins: disable under COMPILE_TEST +$ git reset HEAD^ +Unstaged changes after reset: +M arch/Kconfig +M lib/Kconfig.debug +$ git add -A . +$ git commit -v -a --amend +[master d06cf6e94c5b] Merge remote-tracking branch 'kbuild/for-next' + Date: Tue Jun 14 12:16:21 2016 +1000 +Merging kspp/for-next/kspp (445701384575 gcc-plugins: disable under COMPILE_TEST) +$ git merge kspp/for-next/kspp +Merge made by the 'recursive' strategy. + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/setup.c | 10 +++++----- + arch/arm/kernel/smp.c | 2 +- + arch/arm/lib/delay.c | 2 +- + arch/arm/mm/mmu.c | 9 ++------- + arch/x86/include/asm/desc.h | 2 +- + arch/x86/include/asm/fpu/xstate.h | 3 ++- + arch/x86/kernel/apic/apic_flat_64.c | 6 +++--- + arch/x86/kernel/apic/apic_noop.c | 2 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/probe_32.c | 4 ++-- + arch/x86/kernel/apic/x2apic_cluster.c | 2 +- + arch/x86/kernel/apic/x2apic_phys.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 2 +- + arch/x86/kernel/cpu/common.c | 11 ++++++++--- + arch/x86/kernel/cpu/mtrr/main.c | 4 ++-- + arch/x86/kernel/cpu/mtrr/mtrr.h | 2 +- + arch/x86/kernel/ksysfs.c | 2 +- + arch/x86/kernel/kvmclock.c | 2 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/ptrace.c | 6 +++--- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 4 ++-- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smp.c | 2 +- + arch/x86/kernel/x86_init.c | 6 +++--- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/pci/pcbios.c | 7 +++++-- + 32 files changed, 58 insertions(+), 54 deletions(-) +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (65a003e5c0c9 Merge remote-tracking branches 'regmap/topic/irq' and 'regmap/topic/maintainers' into regmap-next) +$ git merge regmap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/base/regmap/regmap-irq.c | 15 +++++++++++---- + include/linux/regmap.h | 10 ++++++++++ + 3 files changed, 22 insertions(+), 4 deletions(-) +Merging sound/for-next (43aa56d95d2c ALSA: sh: aica: Remove deprecated create_workqueue) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/isa/ad1848/ad1848.c | 13 +------------ + sound/isa/adlib.c | 13 +------------ + sound/isa/cmi8328.c | 13 +------------ + sound/isa/cs423x/cs4231.c | 13 +------------ + sound/isa/galaxy/galaxy.c | 13 +------------ + sound/isa/gus/gusclassic.c | 13 +------------ + sound/isa/gus/gusextreme.c | 13 +------------ + sound/isa/gus/gusmax.c | 13 +------------ + sound/isa/sb/jazz16.c | 13 +------------ + sound/isa/sb/sb8.c | 13 +------------ + sound/isa/sc6000.c | 13 +------------ + sound/pci/hda/hda_generic.c | 4 ---- + sound/sh/aica.c | 16 +++------------- + 13 files changed, 14 insertions(+), 149 deletions(-) +Merging sound-asoc/for-next (4c195b15cd98 Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sti', 'asoc/topic/tas571x', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/wm8985' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/samsung/odroidx2_max98090.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/adi,adau7002.txt | 19 + + .../bindings/sound/brcm,cygnus-audio.txt | 67 + + .../devicetree/bindings/sound/cs53l30.txt | 40 + + .../devicetree/bindings/sound/fsl-asoc-card.txt | 2 +- + .../devicetree/bindings/sound/max9860.txt | 28 + + .../devicetree/bindings/sound/mt8173-rt5650.txt | 5 + + .../devicetree/bindings/sound/omap-mcpdm.txt | 10 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 5 + + .../bindings/sound/samsung,odroidx2-max98090.txt | 35 - + .../devicetree/bindings/sound/sgtl5000.txt | 18 +- + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 20 +- + Documentation/sound/alsa/soc/machine.txt | 2 +- + MAINTAINERS | 11 +- + include/linux/mfd/arizona/core.h | 10 + + include/sound/compress_driver.h | 5 + + include/sound/soc-dapm.h | 5 +- + include/sound/soc.h | 11 + + sound/core/compress_offload.c | 67 +- + sound/soc/atmel/Kconfig | 1 + + sound/soc/bcm/Kconfig | 9 + + sound/soc/bcm/Makefile | 5 + + sound/soc/bcm/cygnus-pcm.c | 861 +++++++++++ + sound/soc/bcm/cygnus-ssp.c | 1529 ++++++++++++++++++++ + sound/soc/bcm/cygnus-ssp.h | 139 ++ + sound/soc/codecs/Kconfig | 33 +- + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/adau-utils.c | 61 + + sound/soc/codecs/adau-utils.h | 7 + + sound/soc/codecs/adau1373.c | 38 +- + sound/soc/codecs/adau17x1.c | 38 +- + sound/soc/codecs/adau7002.c | 80 + + sound/soc/codecs/ak4613.c | 1 - + sound/soc/codecs/ak4642.c | 13 +- + sound/soc/codecs/arizona.c | 93 +- + sound/soc/codecs/arizona.h | 22 +- + sound/soc/codecs/cs47l24.c | 19 + + sound/soc/codecs/cs53l30.c | 1101 ++++++++++++++ + sound/soc/codecs/cs53l30.h | 458 ++++++ + sound/soc/codecs/hdac_hdmi.c | 20 + + sound/soc/codecs/max9860.c | 753 ++++++++++ + sound/soc/codecs/max9860.h | 162 +++ + sound/soc/codecs/nau8825.c | 1236 ++++++++++++++-- + sound/soc/codecs/nau8825.h | 127 +- + sound/soc/codecs/pcm5102a.c | 1 - + sound/soc/codecs/rt5514-spi.c | 459 ++++++ + sound/soc/codecs/rt5514-spi.h | 38 + + sound/soc/codecs/rt5514.c | 136 +- + sound/soc/codecs/rt5514.h | 4 + + sound/soc/codecs/rt5670.c | 2 +- + sound/soc/codecs/tas571x.c | 188 +++ + sound/soc/codecs/tas571x.h | 40 + + sound/soc/codecs/tlv320aic31xx.h | 134 +- + sound/soc/codecs/wm5102.c | 3 +- + sound/soc/codecs/wm5110.c | 20 + + sound/soc/codecs/wm8985.c | 143 +- + sound/soc/codecs/wm8985.h | 38 + + sound/soc/codecs/wm8998.c | 1 + + sound/soc/codecs/wm_adsp.c | 26 +- + sound/soc/codecs/wm_adsp.h | 4 + + sound/soc/davinci/davinci-mcasp.c | 65 +- + sound/soc/davinci/davinci-mcasp.h | 4 +- + sound/soc/dwc/designware_i2s.c | 68 +- + sound/soc/fsl/Kconfig | 1 + + sound/soc/generic/simple-card.c | 55 +- + sound/soc/intel/Kconfig | 16 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 460 ++++++ + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 39 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 39 +- + sound/soc/intel/common/sst-acpi.h | 2 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 26 +- + sound/soc/intel/skylake/skl-messages.c | 45 +- + sound/soc/intel/skylake/skl-nhlt.c | 40 + + sound/soc/intel/skylake/skl-nhlt.h | 22 + + sound/soc/intel/skylake/skl-pcm.c | 93 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 8 + + sound/soc/intel/skylake/skl-sst-ipc.h | 4 + + sound/soc/intel/skylake/skl-sst-utils.c | 256 ++++ + sound/soc/intel/skylake/skl-sst.c | 33 +- + sound/soc/intel/skylake/skl-topology.c | 217 ++- + sound/soc/intel/skylake/skl-topology.h | 6 +- + sound/soc/intel/skylake/skl.c | 17 +- + sound/soc/intel/skylake/skl.h | 10 + + sound/soc/mediatek/mt8173-rt5650.c | 45 +- + sound/soc/mediatek/mtk-afe-pcm.c | 16 +- + sound/soc/omap/Kconfig | 1 + + sound/soc/omap/omap-mcpdm.c | 74 +- + sound/soc/rockchip/rockchip_i2s.c | 71 +- + sound/soc/rockchip/rockchip_i2s.h | 11 +- + sound/soc/rockchip/rockchip_max98090.c | 65 +- + sound/soc/samsung/Kconfig | 8 - + sound/soc/samsung/Makefile | 2 - + sound/soc/samsung/i2s.c | 31 +- + sound/soc/samsung/odroidx2_max98090.c | 185 --- + sound/soc/sh/rcar/adg.c | 20 +- + sound/soc/sh/rcar/rsrc-card.c | 2 - + sound/soc/soc-dapm.c | 58 +- + sound/soc/soc-pcm.c | 43 +- + sound/soc/sti/uniperif_player.c | 4 +- + 101 files changed, 9683 insertions(+), 898 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs53l30.txt + create mode 100644 Documentation/devicetree/bindings/sound/max9860.txt + delete mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt + create mode 100644 sound/soc/bcm/cygnus-pcm.c + create mode 100644 sound/soc/bcm/cygnus-ssp.c + create mode 100644 sound/soc/bcm/cygnus-ssp.h + create mode 100644 sound/soc/codecs/adau-utils.c + create mode 100644 sound/soc/codecs/adau-utils.h + create mode 100644 sound/soc/codecs/adau7002.c + create mode 100644 sound/soc/codecs/cs53l30.c + create mode 100644 sound/soc/codecs/cs53l30.h + create mode 100644 sound/soc/codecs/max9860.c + create mode 100644 sound/soc/codecs/max9860.h + create mode 100644 sound/soc/codecs/rt5514-spi.c + create mode 100644 sound/soc/codecs/rt5514-spi.h + create mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c + create mode 100644 sound/soc/intel/skylake/skl-sst-utils.c + delete mode 100644 sound/soc/samsung/odroidx2_max98090.c +Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging init/Kconfig +Auto-merging include/linux/module.h +Merge made by the 'recursive' strategy. + Documentation/module-signing.txt | 6 ++++++ + include/linux/module.h | 4 ++-- + init/Kconfig | 1 + + kernel/module.c | 29 +++++++++++++++++++++-------- + 4 files changed, 30 insertions(+), 10 deletions(-) +Merging input/next (1afca2b66aac Input: add Pegasus Notetaker tablet driver) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/input.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,captouch.txt | 36 + + .../devicetree/bindings/input/raydium_i2c_ts.txt | 20 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/input/input-mt.c | 17 +- + drivers/input/input.c | 7 +- + drivers/input/keyboard/tc3589x-keypad.c | 2 +- + drivers/input/misc/Kconfig | 14 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/atmel_captouch.c | 290 +++++ + drivers/input/rmi4/rmi_f01.c | 22 +- + drivers/input/tablet/Kconfig | 15 + + drivers/input/tablet/Makefile | 1 + + drivers/input/tablet/pegasus_notetaker.c | 421 +++++++ + drivers/input/touchscreen/Kconfig | 28 +- + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/migor_ts.c | 6 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 1214 ++++++++++++++++++++ + drivers/input/touchscreen/surface3_spi.c | 427 +++++++ + drivers/input/touchscreen/ti_am335x_tsc.c | 2 +- + 19 files changed, 2504 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/atmel,captouch.txt + create mode 100644 Documentation/devicetree/bindings/input/raydium_i2c_ts.txt + create mode 100644 drivers/input/misc/atmel_captouch.c + create mode 100644 drivers/input/tablet/pegasus_notetaker.c + create mode 100644 drivers/input/touchscreen/raydium_i2c_ts.c + create mode 100644 drivers/input/touchscreen/surface3_spi.c +Merging block/for-next (6f785ee3645f Merge branch 'for-4.8/drivers' into for-next) +$ git merge block/for-next +Recorded preimage for 'block/blk-lib.c' +Recorded preimage for 'fs/btrfs/extent_io.c' +Resolved 'fs/f2fs/data.c' using previous resolution. +Resolved 'fs/f2fs/segment.c' using previous resolution. +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_buf.c +Auto-merging fs/reiserfs/super.c +Auto-merging fs/f2fs/segment.c +CONFLICT (content): Merge conflict in fs/f2fs/segment.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/inline.c +Auto-merging fs/f2fs/gc.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.h +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/extent-tree.c +Auto-merging fs/btrfs/disk-io.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/check-integrity.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/block/nbd.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-lib.c +CONFLICT (content): Merge conflict in block/blk-lib.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'block/blk-lib.c'. +Recorded resolution for 'fs/btrfs/extent_io.c'. +[master 60f7c090287a] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/writeback_cache_control.txt | 28 +- + Documentation/device-mapper/log-writes.txt | 10 +- + arch/um/drivers/ubd_kern.c | 2 +- + block/bio.c | 20 +- + block/blk-core.c | 119 ++++--- + block/blk-flush.c | 23 +- + block/blk-lib.c | 44 +-- + block/blk-map.c | 2 +- + block/blk-merge.c | 22 +- + block/blk-mq.c | 42 +-- + block/cfq-iosched.c | 407 ++++++++++++++---------- + block/elevator.c | 7 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 32 +- + drivers/block/drbd/drbd_bitmap.c | 8 +- + drivers/block/drbd/drbd_int.h | 8 +- + drivers/block/drbd/drbd_main.c | 20 +- + drivers/block/drbd/drbd_protocol.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 36 ++- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/drbd/drbd_worker.c | 7 +- + drivers/block/floppy.c | 3 +- + drivers/block/loop.c | 14 +- + drivers/block/mg_disk.c | 7 +- + drivers/block/mtip32xx/mtip32xx.c | 2 +- + drivers/block/nbd.c | 4 +- + drivers/block/osdblk.c | 2 +- + drivers/block/pktcdvd.c | 4 +- + drivers/block/ps3disk.c | 4 +- + drivers/block/rbd.c | 4 +- + drivers/block/rsxx/dma.c | 2 +- + drivers/block/skd_main.c | 2 +- + drivers/block/umem.c | 2 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xen-blkback/blkback.c | 27 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 75 +++-- + drivers/block/zram/zram_drv.c | 2 +- + drivers/ide/ide-cd_ioctl.c | 3 - + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/lightnvm/rrpc.c | 6 +- + drivers/md/bcache/btree.c | 4 +- + drivers/md/bcache/debug.c | 6 +- + drivers/md/bcache/io.c | 2 +- + drivers/md/bcache/journal.c | 9 +- + drivers/md/bcache/movinggc.c | 2 +- + drivers/md/bcache/request.c | 28 +- + drivers/md/bcache/super.c | 31 +- + drivers/md/bcache/writeback.c | 4 +- + drivers/md/bitmap.c | 6 +- + drivers/md/dm-bufio.c | 9 +- + drivers/md/dm-cache-target.c | 18 +- + drivers/md/dm-crypt.c | 11 +- + drivers/md/dm-era-target.c | 4 +- + drivers/md/dm-flakey.c | 2 +- + drivers/md/dm-io.c | 57 ++-- + drivers/md/dm-kcopyd.c | 11 +- + drivers/md/dm-log-writes.c | 13 +- + drivers/md/dm-log.c | 5 +- + drivers/md/dm-raid.c | 5 +- + drivers/md/dm-raid1.c | 22 +- + drivers/md/dm-region-hash.c | 6 +- + drivers/md/dm-snap-persistent.c | 24 +- + drivers/md/dm-snap.c | 6 +- + drivers/md/dm-stats.c | 9 +- + drivers/md/dm-stripe.c | 6 +- + drivers/md/dm-thin.c | 22 +- + drivers/md/dm.c | 45 +-- + drivers/md/linear.c | 4 +- + drivers/md/md.c | 18 +- + drivers/md/md.h | 5 +- + drivers/md/multipath.c | 2 +- + drivers/md/raid0.c | 4 +- + drivers/md/raid1.c | 37 ++- + drivers/md/raid10.c | 51 ++- + drivers/md/raid5-cache.c | 33 +- + drivers/md/raid5.c | 48 +-- + drivers/mmc/card/block.c | 21 +- + drivers/mmc/card/queue.c | 8 +- + drivers/mmc/card/queue.h | 6 +- + drivers/mtd/mtd_blkdevs.c | 4 +- + drivers/nvme/host/core.c | 73 ++++- + drivers/nvme/host/nvme.h | 5 +- + drivers/nvme/host/pci.c | 30 +- + drivers/scsi/osd/osd_initiator.c | 12 +- + drivers/scsi/sd.c | 20 +- + drivers/staging/lustre/lustre/llite/lloop.c | 6 +- + drivers/target/target_core_iblock.c | 41 +-- + drivers/target/target_core_pscsi.c | 2 +- + fs/btrfs/check-integrity.c | 61 ++-- + fs/btrfs/check-integrity.h | 6 +- + fs/btrfs/compression.c | 17 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/disk-io.c | 43 ++- + fs/btrfs/disk-io.h | 2 +- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/extent_io.c | 91 +++--- + fs/btrfs/extent_io.h | 8 +- + fs/btrfs/inode.c | 70 ++-- + fs/btrfs/raid56.c | 17 +- + fs/btrfs/scrub.c | 15 +- + fs/btrfs/volumes.c | 91 +++--- + fs/btrfs/volumes.h | 6 +- + fs/buffer.c | 69 ++-- + fs/crypto/crypto.c | 3 +- + fs/direct-io.c | 35 +- + fs/exofs/ore.c | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/crypto.c | 3 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 8 +- + fs/ext4/mmp.c | 4 +- + fs/ext4/namei.c | 3 +- + fs/ext4/page-io.c | 7 +- + fs/ext4/readpage.c | 9 +- + fs/ext4/super.c | 2 +- + fs/f2fs/checkpoint.c | 10 +- + fs/f2fs/data.c | 48 +-- + fs/f2fs/f2fs.h | 5 +- + fs/f2fs/gc.c | 9 +- + fs/f2fs/inline.c | 3 +- + fs/f2fs/node.c | 8 +- + fs/f2fs/segment.c | 14 +- + fs/f2fs/trace.c | 7 +- + fs/fat/misc.c | 2 +- + fs/gfs2/bmap.c | 4 +- + fs/gfs2/dir.c | 2 +- + fs/gfs2/log.c | 8 +- + fs/gfs2/lops.c | 12 +- + fs/gfs2/lops.h | 2 +- + fs/gfs2/meta_io.c | 18 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/gfs2/quota.c | 2 +- + fs/hfsplus/hfsplus_fs.h | 2 +- + fs/hfsplus/part_tbl.c | 5 +- + fs/hfsplus/super.c | 6 +- + fs/hfsplus/wrapper.c | 15 +- + fs/isofs/compress.c | 2 +- + fs/jbd2/commit.c | 6 +- + fs/jbd2/journal.c | 10 +- + fs/jbd2/recovery.c | 4 +- + fs/jfs/jfs_logmgr.c | 6 +- + fs/jfs/jfs_metapage.c | 10 +- + fs/logfs/dev_bdev.c | 17 +- + fs/mpage.c | 41 +-- + fs/nfs/blocklayout/blocklayout.c | 22 +- + fs/nilfs2/btnode.c | 6 +- + fs/nilfs2/btnode.h | 2 +- + fs/nilfs2/btree.c | 6 +- + fs/nilfs2/gcinode.c | 5 +- + fs/nilfs2/mdt.c | 11 +- + fs/nilfs2/segbuf.c | 18 +- + fs/ntfs/aops.c | 6 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/file.c | 2 +- + fs/ntfs/logfile.c | 2 +- + fs/ntfs/mft.c | 4 +- + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/buffer_head_io.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 14 +- + fs/ocfs2/super.c | 2 +- + fs/reiserfs/inode.c | 4 +- + fs/reiserfs/journal.c | 14 +- + fs/reiserfs/stree.c | 4 +- + fs/reiserfs/super.c | 2 +- + fs/squashfs/block.c | 4 +- + fs/udf/dir.c | 2 +- + fs/udf/directory.c | 2 +- + fs/udf/inode.c | 2 +- + fs/ufs/balloc.c | 2 +- + fs/ufs/util.c | 2 +- + fs/xfs/xfs_aops.c | 11 +- + fs/xfs/xfs_buf.c | 32 +- + include/linux/bio.h | 83 +---- + include/linux/blk-cgroup.h | 13 +- + include/linux/blk_types.h | 69 ++-- + include/linux/blkdev.h | 64 ++-- + include/linux/blktrace_api.h | 2 +- + include/linux/buffer_head.h | 11 +- + include/linux/bvec.h | 96 ++++++ + include/linux/dm-io.h | 3 +- + include/linux/elevator.h | 4 +- + include/linux/fs.h | 43 ++- + include/linux/nvme.h | 69 +++- + include/trace/events/bcache.h | 12 +- + include/trace/events/block.h | 31 +- + include/trace/events/f2fs.h | 37 ++- + kernel/power/swap.c | 33 +- + kernel/trace/blktrace.c | 76 +++-- + lib/iov_iter.c | 45 +-- + mm/page_io.c | 10 +- + 193 files changed, 1992 insertions(+), 1576 deletions(-) + create mode 100644 include/linux/bvec.h +Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect) +$ git merge lightnvm/for-next +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (e83068a5faaf dm mpath: add optional "queue_mode" feature) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/Makefile | 3 +- + drivers/md/dm-builtin.c | 2 +- + drivers/md/dm-core.h | 149 ++++++ + drivers/md/dm-io.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-kcopyd.c | 2 +- + drivers/md/dm-mpath.c | 354 +++++++++++-- + drivers/md/dm-rq.c | 968 +++++++++++++++++++++++++++++++++++ + drivers/md/dm-rq.h | 64 +++ + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-sysfs.c | 3 +- + drivers/md/dm-table.c | 69 ++- + drivers/md/dm-target.c | 2 +- + drivers/md/dm.c | 1125 +---------------------------------------- + drivers/md/dm.h | 35 +- + include/linux/device-mapper.h | 16 + + 16 files changed, 1589 insertions(+), 1209 deletions(-) + create mode 100644 drivers/md/dm-core.h + create mode 100644 drivers/md/dm-rq.c + create mode 100644 drivers/md/dm-rq.h +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (b28173343703 mmc: tmio: make a cast explicit) +$ git merge mmc-uh/next +Auto-merging drivers/mmc/card/block.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 1 + + MAINTAINERS | 1 + + drivers/mmc/card/block.c | 4 +- + drivers/mmc/core/bus.c | 3 +- + drivers/mmc/core/core.c | 9 +++ + drivers/mmc/core/debugfs.c | 3 +- + drivers/mmc/core/host.c | 2 + + drivers/mmc/core/mmc.c | 84 ++++++++++++++++++++++++++- + drivers/mmc/host/sdhci-of-arasan.c | 20 +++++++ + drivers/mmc/host/sdhci.c | 17 +++++- + drivers/mmc/host/sh_mobile_sdhi.c | 14 +++-- + drivers/mmc/host/tmio_mmc.h | 2 +- + include/linux/mmc/card.h | 1 + + include/linux/mmc/host.h | 12 ++++ + include/linux/mmc/mmc.h | 3 + + 15 files changed, 163 insertions(+), 13 deletions(-) +Merging md/for-next (d787be4092e2 md: reduce the number of synchronize_rcu() calls when multiple devices fail.) +$ git merge md/for-next +Recorded preimage for 'drivers/md/raid1.c' +Recorded preimage for 'drivers/md/raid10.c' +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +CONFLICT (content): Merge conflict in drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +CONFLICT (content): Merge conflict in drivers/md/raid1.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/md/raid1.c'. +Recorded resolution for 'drivers/md/raid10.c'. +[master a5ba5863028f] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/md.c | 65 +++++++++++---- + drivers/md/md.h | 8 ++ + drivers/md/multipath.c | 29 ++++--- + drivers/md/raid1.c | 133 +++++++++++++++--------------- + drivers/md/raid10.c | 218 ++++++++++++++++++++++++++++++------------------- + drivers/md/raid5.c | 45 ++++++---- + 6 files changed, 303 insertions(+), 195 deletions(-) +Merging mfd/for-mfd-next (b52207ef4ea5 mfd: hi655x: Add MFD driver for hi655x) +$ git merge mfd/for-mfd-next +Already up-to-date. +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 (d04b674e1887 power/reset: make syscon_poweroff() static) +$ git merge battery/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power_supply/axp20x_usb_power.txt | 3 +- + MAINTAINERS | 2 + + drivers/power/axp20x_usb_power.c | 92 ++++++-- + drivers/power/bq27xxx_battery.c | 238 ++++++++++----------- + drivers/power/bq27xxx_battery_i2c.c | 2 +- + drivers/power/reset/Kconfig | 3 +- + drivers/power/reset/syscon-poweroff.c | 2 +- + 7 files changed, 196 insertions(+), 146 deletions(-) +Merging omap_dss2/for-next (ab366b40b851 fbdev: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (d86007e58274 Merge remote-tracking branches 'regulator/topic/mt6397', 'regulator/topic/pfuze100', 'regulator/topic/pwm' and 'regulator/topic/twl' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 6 + + drivers/regulator/Kconfig | 4 +- + drivers/regulator/axp20x-regulator.c | 147 ++++++++++++++++++----- + drivers/regulator/core.c | 27 ----- + drivers/regulator/fixed.c | 14 +-- + drivers/regulator/max8973-regulator.c | 16 +-- + drivers/regulator/mt6397-regulator.c | 95 +++++++++++++-- + drivers/regulator/pfuze100-regulator.c | 15 ++- + drivers/regulator/pv88060-regulator.c | 3 - + drivers/regulator/pv88080-regulator.c | 3 - + drivers/regulator/pv88090-regulator.c | 3 - + drivers/regulator/pwm-regulator.c | 5 - + drivers/regulator/qcom_smd-regulator.c | 15 ++- + drivers/regulator/tps51632-regulator.c | 9 +- + drivers/regulator/twl-regulator.c | 2 +- + include/linux/regulator/consumer.h | 6 - + 16 files changed, 246 insertions(+), 124 deletions(-) +Merging security/next (40d273782ff1 security: tomoyo: simplify the gc kthread creation) +$ git merge security/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + include/linux/capability.h | 5 +++++ + kernel/capability.c | 46 ++++++++++++++++++++++++++++++++++++---------- + net/sysctl_net.c | 2 +- + security/security.c | 29 +++++++++++++++++++++++++---- + security/tomoyo/gc.c | 9 ++------- + 6 files changed, 70 insertions(+), 23 deletions(-) +Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record) +$ git merge keys/keys-next +Already up-to-date. +Merging selinux/next (50b8629a606b netlabel: handle sparse category maps in netlbl_catmap_getlong()) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + net/iucv/af_iucv.c | 5 ++- + net/netlabel/netlabel_kapi.c | 21 ++++++++----- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/services.c | 70 +++++++++++++----------------------------- + 4 files changed, 41 insertions(+), 57 deletions(-) +Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression) +$ git merge tpmdd/next +Auto-merging include/uapi/linux/Kbuild +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tpm/tpm_vtpm_proxy.txt | 71 ++++ + drivers/char/tpm/Kconfig | 11 + + drivers/char/tpm/Makefile | 1 + + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 70 +++- + drivers/char/tpm/st33zp24/spi.c | 184 ++++++---- + drivers/char/tpm/st33zp24/st33zp24.c | 125 +++---- + drivers/char/tpm/st33zp24/st33zp24.h | 14 +- + drivers/char/tpm/tpm-chip.c | 284 ++++++++++----- + drivers/char/tpm/tpm-dev.c | 15 +- + drivers/char/tpm/tpm-interface.c | 105 +++--- + drivers/char/tpm/tpm-sysfs.c | 78 ++-- + drivers/char/tpm/tpm.h | 73 ++-- + drivers/char/tpm/tpm2-cmd.c | 11 +- + drivers/char/tpm/tpm_atmel.c | 63 ++-- + drivers/char/tpm/tpm_atmel.h | 16 +- + drivers/char/tpm/tpm_crb.c | 73 ++-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 39 +- + drivers/char/tpm/tpm_i2c_infineon.c | 55 ++- + drivers/char/tpm/tpm_i2c_nuvoton.c | 98 ++--- + drivers/char/tpm/tpm_ibmvtpm.c | 38 +- + drivers/char/tpm/tpm_infineon.c | 22 +- + drivers/char/tpm/tpm_nsc.c | 84 +++-- + drivers/char/tpm/tpm_tis.c | 266 +++++++------- + drivers/char/tpm/tpm_vtpm_proxy.c | 644 +++++++++++++++++++++++++++++++++ + drivers/char/tpm/xen-tpmfront.c | 36 +- + include/linux/platform_data/st33zp24.h | 2 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/vtpm_proxy.h | 36 ++ + 32 files changed, 1768 insertions(+), 765 deletions(-) + create mode 100644 Documentation/tpm/tpm_vtpm_proxy.txt + create mode 100644 drivers/char/tpm/tpm_vtpm_proxy.c + create mode 100644 include/uapi/linux/vtpm_proxy.h +Merging watchdog/master (1a695a905c18 Linux 4.7-rc1) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (f70552809419 vfio_pci: Test for extended capabilities if config space > 256 bytes) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (8569de68e79e docs: kernel-doc: Add "example" and "note" to the magic section types) +$ git merge jc_docs/docs-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/.gitignore | 1 + + Documentation/DocBook/Makefile | 7 +- + Documentation/Makefile.sphinx | 63 ++++ + Documentation/conf.py | 414 ++++++++++++++++++++ + Documentation/dmaengine/provider.txt | 2 +- + Documentation/index.rst | 23 ++ + Documentation/kernel-parameters.txt | 5 +- + Documentation/mic/mpssd/mpssd.c | 4 +- + Documentation/security/self-protection.txt | 28 +- + Documentation/sphinx/convert_template.sed | 18 + + Documentation/sphinx/kernel-doc.py | 127 +++++++ + Documentation/sphinx/post_convert.sed | 23 ++ + Documentation/sphinx/tmplcvt | 19 + + Documentation/sync_file.txt | 6 +- + Documentation/zh_CN/CodingStyle | 581 +++++++++++++++++------------ + Makefile | 5 +- + scripts/kernel-doc | 393 ++++++++++++------- + 17 files changed, 1326 insertions(+), 393 deletions(-) + create mode 100644 Documentation/.gitignore + create mode 100644 Documentation/Makefile.sphinx + create mode 100644 Documentation/conf.py + create mode 100644 Documentation/index.rst + create mode 100644 Documentation/sphinx/convert_template.sed + create mode 100644 Documentation/sphinx/kernel-doc.py + create mode 100644 Documentation/sphinx/post_convert.sed + create mode 100755 Documentation/sphinx/tmplcvt +Merging trivial/for-next (52bbe141f37f gitignore: fix wording) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (2b4c7afe79a8 audit: fixup: log on errors from filter user rules) +$ git merge audit/next +Merge made by the 'recursive' strategy. + kernel/auditfilter.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging devicetree/for-next (06dfeef88573 drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch) +$ git merge devicetree/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (9ef3c5112139 mailbox: mailbox-test: set tdev->signal to NULL after freeing) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-test.c | 1 + + 1 file changed, 1 insertion(+) +Merging spi/for-next (50fdfdf1300c Merge remote-tracking branches 'spi/topic/flash-dma', 'spi/topic/maintainers', 'spi/topic/orion', 'spi/topic/pxa2xx' and 'spi/topic/rockchip' into spi-next) +$ git merge spi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-orion.txt | 49 +++++++++++- + .../devicetree/bindings/spi/spi-rockchip.txt | 11 ++- + MAINTAINERS | 1 + + drivers/spi/spi-orion.c | 88 ++++++++++++++++++++++ + drivers/spi/spi-pxa2xx.c | 10 +-- + drivers/spi/spi-rockchip.c | 7 +- + drivers/spi/spi-ti-qspi.c | 7 ++ + drivers/spi/spi.c | 28 +++++++ + include/linux/spi/spi.h | 4 + + 9 files changed, 190 insertions(+), 15 deletions(-) +Merging tip/auto-latest (b2fcfd7a8046 Merge branch 'x86/asm') +$ git merge tip/auto-latest +Auto-merging drivers/powercap/intel_rapl.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/x86/early-microcode.txt | 5 +- + MAINTAINERS | 16 +- + arch/alpha/include/asm/rwsem.h | 68 +-- + arch/ia64/include/asm/mutex.h | 2 +- + arch/ia64/include/asm/rwsem.h | 31 +- + arch/powerpc/include/asm/mutex.h | 2 +- + arch/s390/include/asm/rwsem.h | 37 -- + arch/x86/Kconfig | 8 +- + arch/x86/boot/bitops.h | 8 +- + arch/x86/boot/boot.h | 17 +- + arch/x86/boot/string.c | 2 +- + arch/x86/events/core.c | 23 + + arch/x86/events/intel/core.c | 181 +++++-- + arch/x86/events/intel/cstate.c | 47 +- + arch/x86/events/intel/rapl.c | 32 +- + arch/x86/events/intel/uncore.c | 84 +-- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_snbep.c | 96 +++- + arch/x86/events/msr.c | 63 ++- + arch/x86/events/perf_event.h | 10 + + arch/x86/include/asm/apm.h | 6 +- + arch/x86/include/asm/arch_hweight.h | 24 +- + arch/x86/include/asm/archrandom.h | 132 +++-- + arch/x86/include/asm/asm.h | 12 + + arch/x86/include/asm/atomic.h | 16 +- + arch/x86/include/asm/atomic64_64.h | 18 +- + arch/x86/include/asm/bitops.h | 50 +- + arch/x86/include/asm/fpu/internal.h | 5 + + arch/x86/include/asm/local.h | 16 +- + arch/x86/include/asm/microcode.h | 26 - + arch/x86/include/asm/microcode_amd.h | 1 - + arch/x86/include/asm/microcode_intel.h | 5 - + arch/x86/include/asm/mutex_32.h | 2 +- + arch/x86/include/asm/mutex_64.h | 6 +- + arch/x86/include/asm/percpu.h | 17 +- + arch/x86/include/asm/preempt.h | 2 +- + arch/x86/include/asm/rmwcc.h | 20 +- + arch/x86/include/asm/rwsem.h | 35 +- + arch/x86/include/asm/signal.h | 6 +- + arch/x86/include/asm/sync_bitops.h | 18 +- + arch/x86/include/asm/topology.h | 21 +- + arch/x86/include/asm/trace/fpu.h | 119 +++++ + arch/x86/include/asm/uaccess.h | 23 +- + arch/x86/kernel/apic/apic.c | 6 +- + arch/x86/kernel/apic/io_apic.c | 18 +- + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/kernel/cpu/microcode/amd.c | 33 +- + arch/x86/kernel/cpu/microcode/core.c | 9 +- + arch/x86/kernel/cpu/microcode/intel.c | 227 ++++---- + arch/x86/kernel/cpu/rdrand.c | 4 +- + arch/x86/kernel/fpu/core.c | 18 + + arch/x86/kernel/fpu/signal.c | 3 + + arch/x86/kernel/i386_ksyms_32.c | 2 + + arch/x86/kernel/smpboot.c | 25 +- + arch/x86/kernel/vm86_32.c | 5 +- + arch/x86/kernel/x8664_ksyms_64.c | 3 + + arch/x86/kvm/x86.c | 6 +- + arch/x86/lguest/boot.c | 17 +- + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/hweight.S | 77 +++ + arch/x86/mm/init.c | 7 - + arch/x86/platform/atom/punit_atom_debug.c | 5 +- + arch/x86/xen/enlighten.c | 4 +- + drivers/acpi/acpi_lpss.c | 5 +- + drivers/cpufreq/intel_pstate.c | 37 +- + drivers/idle/intel_idle.c | 71 +-- + drivers/mmc/host/sdhci-acpi.c | 3 +- + drivers/platform/x86/intel_pmc_core.c | 9 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 3 +- + drivers/platform/x86/intel_telemetry_pltdrv.c | 3 +- + drivers/powercap/intel_rapl.c | 50 +- + drivers/thermal/intel_soc_dts_thermal.c | 4 +- + fs/timerfd.c | 10 + + include/asm-generic/mutex-dec.h | 2 +- + include/asm-generic/mutex-xchg.h | 6 +- + include/asm-generic/qspinlock.h | 5 +- + include/asm-generic/rwsem.h | 22 +- + include/linux/compiler.h | 4 + + include/linux/futex.h | 12 +- + include/linux/percpu-refcount.h | 12 +- + include/linux/perf_event.h | 15 +- + include/linux/random.h | 12 +- + include/linux/rwsem.h | 8 +- + include/linux/sched.h | 5 + + include/uapi/linux/futex.h | 6 +- + include/uapi/linux/perf_event.h | 6 +- + kernel/bpf/stackmap.c | 2 +- + kernel/events/callchain.c | 14 +- + kernel/events/core.c | 158 ++++-- + kernel/exit.c | 76 +++ + kernel/fork.c | 7 + + kernel/futex.c | 557 +++++++++++++++++++- + kernel/irq/proc.c | 9 +- + kernel/locking/lockdep.c | 13 +- + kernel/locking/mutex-debug.h | 4 +- + kernel/locking/mutex.h | 10 +- + kernel/locking/qspinlock.c | 72 ++- + kernel/locking/rtmutex.c | 2 +- + kernel/locking/rwsem-xadd.c | 194 ++++--- + kernel/locking/rwsem.c | 8 +- + kernel/locking/rwsem.h | 52 +- + kernel/rcu/tree.c | 1 - + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 38 +- + kernel/sched/idle.c | 4 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/timer.c | 8 +- + lib/Makefile | 5 - + lib/earlycpio.c | 5 +- + lib/hweight.c | 4 + + tools/lib/api/Makefile | 1 + + tools/lib/api/fd/array.c | 5 +- + tools/lib/api/fd/array.h | 3 +- + tools/lib/bpf/libbpf.c | 60 +-- + tools/lib/bpf/libbpf.h | 25 +- + tools/perf/.gitignore | 1 + + tools/perf/Documentation/perf-stat.txt | 32 ++ + tools/perf/arch/arm/util/Build | 2 +- + tools/perf/arch/arm64/util/Build | 2 +- + tools/perf/arch/arm64/util/unwind-libunwind.c | 4 +- + tools/perf/arch/common.c | 2 +- + tools/perf/arch/common.h | 1 + + tools/perf/arch/x86/util/Build | 3 +- + tools/perf/arch/x86/util/group.c | 27 + + tools/perf/arch/x86/util/tsc.c | 2 + + tools/perf/arch/x86/util/unwind-libunwind.c | 6 +- + tools/perf/bench/futex-hash.c | 38 +- + tools/perf/bench/futex.h | 14 + + tools/perf/builtin-record.c | 9 +- + tools/perf/builtin-script.c | 23 +- + tools/perf/builtin-stat.c | 165 +++++- + tools/perf/config/Makefile | 52 +- + tools/perf/tests/fdarray.c | 8 +- + tools/perf/tests/parse-events.c | 4 +- + tools/perf/util/Build | 3 + + tools/perf/util/bpf-loader.c | 132 ++--- + tools/perf/util/build-id.c | 112 +++- + tools/perf/util/build-id.h | 2 + + tools/perf/util/callchain.h | 1 + + tools/perf/util/config.c | 73 ++- + tools/perf/util/db-export.c | 13 +- + tools/perf/util/dso.h | 5 + + tools/perf/util/evlist.c | 48 +- + tools/perf/util/evlist.h | 2 + + tools/perf/util/evsel.c | 44 +- + tools/perf/util/evsel.h | 4 + + tools/perf/util/group.h | 7 + + tools/perf/util/libunwind/arm64.c | 35 ++ + tools/perf/util/libunwind/x86_32.c | 37 ++ + tools/perf/util/machine.c | 14 +- + tools/perf/util/parse-events.c | 8 + + tools/perf/util/parse-events.h | 1 + + tools/perf/util/parse-events.l | 2 + + tools/perf/util/session.c | 2 + + tools/perf/util/stat-shadow.c | 162 ++++++ + tools/perf/util/stat.c | 5 + + tools/perf/util/stat.h | 5 + + tools/perf/util/symbol.c | 71 ++- + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 11 +- + tools/perf/util/unwind-libunwind-local.c | 697 +++++++++++++++++++++++++ + tools/perf/util/unwind-libunwind.c | 688 ++---------------------- + tools/perf/util/unwind.h | 22 +- + 163 files changed, 4079 insertions(+), 1991 deletions(-) + create mode 100644 arch/x86/include/asm/trace/fpu.h + create mode 100644 arch/x86/lib/hweight.S + create mode 100644 tools/perf/arch/x86/util/group.c + create mode 100644 tools/perf/util/group.h + create mode 100644 tools/perf/util/libunwind/arm64.c + create mode 100644 tools/perf/util/libunwind/x86_32.c + create mode 100644 tools/perf/util/unwind-libunwind-local.c +Merging clockevents/clockevents/next (52be039599e1 Merge branch 'clockevents/clksrc-of-ret-4' into clockevents/next) +$ git merge clockevents/clockevents/next +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/mach-mxs/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/arm_arch_timer.c' using previous resolution. +Auto-merging include/linux/of.h +Auto-merging drivers/clocksource/tango_xtal.c +Auto-merging drivers/clocksource/arm_arch_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/arm_arch_timer.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/mips/ralink/cevt-rt3352.c +Auto-merging arch/arm/mach-u300/Kconfig +Auto-merging arch/arm/mach-prima2/Kconfig +Auto-merging arch/arm/mach-mxs/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/Kconfig +Auto-merging arch/arm/mach-moxart/Kconfig +Auto-merging arch/arm/mach-keystone/Kconfig +Auto-merging arch/arm/mach-integrator/Kconfig +Auto-merging arch/arm/mach-bcm/Kconfig +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4342fe61c1e0] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 +- + arch/arm/kernel/smp_twd.c | 3 +- + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-integrator/Kconfig | 2 +- + arch/arm/mach-keystone/Kconfig | 2 +- + arch/arm/mach-moxart/Kconfig | 2 +- + arch/arm/mach-mxs/Kconfig | 2 +- + arch/arm/mach-nspire/Kconfig | 1 + + arch/arm/mach-prima2/Kconfig | 2 + + arch/arm/mach-u300/Kconfig | 2 +- + arch/microblaze/kernel/timer.c | 49 ++++++++++++---- + arch/mips/ralink/cevt-rt3352.c | 17 ++++-- + arch/nios2/kernel/time.c | 67 ++++++++++++++------- + drivers/clocksource/Kconfig | 93 ++++++++++++++++++++++++++++-- + drivers/clocksource/Makefile | 22 +++---- + drivers/clocksource/arm_arch_timer.c | 44 ++++++++------ + drivers/clocksource/arm_global_timer.c | 26 ++++++--- + drivers/clocksource/armv7m_systick.c | 17 ++++-- + drivers/clocksource/asm9260_timer.c | 22 ++++--- + drivers/clocksource/bcm2835_timer.c | 38 ++++++++---- + drivers/clocksource/bcm_kona_timer.c | 9 +-- + drivers/clocksource/cadence_ttc_timer.c | 74 +++++++++++++++--------- + drivers/clocksource/clksrc-dbx500-prcmu.c | 4 +- + drivers/clocksource/clksrc-probe.c | 14 ++++- + drivers/clocksource/clksrc_st_lpc.c | 20 ++++--- + drivers/clocksource/clps711x-timer.c | 10 ++-- + drivers/clocksource/dw_apb_timer_of.c | 4 +- + drivers/clocksource/exynos_mct.c | 32 +++++++---- + drivers/clocksource/fsl_ftm_timer.c | 20 ++++--- + drivers/clocksource/h8300_timer16.c | 12 ++-- + drivers/clocksource/h8300_timer8.c | 11 ++-- + drivers/clocksource/h8300_tpu.c | 10 ++-- + drivers/clocksource/meson6_timer.c | 19 ++++-- + drivers/clocksource/mips-gic-timer.c | 24 +++++--- + drivers/clocksource/moxart_timer.c | 39 ++++++++----- + drivers/clocksource/mps2-timer.c | 8 ++- + drivers/clocksource/mtk_timer.c | 8 ++- + drivers/clocksource/mxs_timer.c | 26 ++++++--- + drivers/clocksource/nomadik-mtu.c | 43 +++++++++----- + drivers/clocksource/pxa_timer.c | 44 ++++++++++---- + drivers/clocksource/qcom-timer.c | 23 ++++---- + drivers/clocksource/rockchip_timer.c | 10 ++-- + drivers/clocksource/samsung_pwm_timer.c | 54 +++++++++-------- + drivers/clocksource/sun4i_timer.c | 43 ++++++++++---- + drivers/clocksource/tango_xtal.c | 10 ++-- + drivers/clocksource/tegra20_timer.c | 24 ++++---- + drivers/clocksource/time-armada-370-xp.c | 96 +++++++++++++++++++++++-------- + drivers/clocksource/time-efm32.c | 16 ++++-- + drivers/clocksource/time-lpc32xx.c | 10 ++-- + drivers/clocksource/time-orion.c | 50 +++++++++++----- + drivers/clocksource/time-pistachio.c | 18 +++--- + drivers/clocksource/timer-atlas7.c | 30 ++++++---- + drivers/clocksource/timer-atmel-pit.c | 41 ++++++++----- + drivers/clocksource/timer-atmel-st.c | 42 +++++++++----- + drivers/clocksource/timer-digicolor.c | 14 +++-- + drivers/clocksource/timer-imx-gpt.c | 50 ++++++++++------ + drivers/clocksource/timer-integrator-ap.c | 57 +++++++++++------- + drivers/clocksource/timer-keystone.c | 13 +++-- + drivers/clocksource/timer-prima2.c | 42 ++++++++++---- + drivers/clocksource/timer-sp804.c | 87 ++++++++++++++++++---------- + drivers/clocksource/timer-stm32.c | 8 ++- + drivers/clocksource/timer-sun5i.c | 33 +++++++---- + drivers/clocksource/timer-ti-32k.c | 8 ++- + drivers/clocksource/timer-u300.c | 36 ++++++++---- + drivers/clocksource/versatile.c | 6 +- + drivers/clocksource/vf_pit_timer.c | 25 +++++--- + drivers/clocksource/vt8500_timer.c | 24 +++++--- + drivers/clocksource/zevio-timer.c | 4 +- + include/clocksource/timer-sp804.h | 8 +-- + include/linux/clk.h | 4 ++ + include/linux/clocksource.h | 2 +- + include/linux/of.h | 3 + + 72 files changed, 1176 insertions(+), 561 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 (ab564cb51ee6 EDAC, altera: Handle Arria10 SDRAM child node) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + .../bindings/arm/altera/socfpga-eccmgr.txt | 14 +- + drivers/edac/altera_edac.c | 187 ++++++++++++++++----- + drivers/edac/altera_edac.h | 5 +- + 3 files changed, 160 insertions(+), 46 deletions(-) +Merging irqchip/irqchip/for-next (ebf63bb87f67 Merge branch 'irqchip/misc' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Merge made by the 'recursive' strategy. + drivers/irqchip/irq-armada-370-xp.c | 2 +- + drivers/irqchip/irq-bcm2835.c | 3 +-- + drivers/irqchip/irq-bcm2836.c | 6 +++--- + drivers/irqchip/irq-bcm7120-l2.c | 10 +++++----- + drivers/irqchip/irq-brcmstb-l2.c | 4 ++-- + drivers/irqchip/irq-gic-v2m.c | 1 + + drivers/irqchip/irq-omap-intc.c | 2 ++ + drivers/irqchip/irq-sirfsoc.c | 11 ++++++++--- + drivers/irqchip/irq-tegra.c | 4 ++-- + drivers/irqchip/irq-vic.c | 5 +++-- + 10 files changed, 28 insertions(+), 20 deletions(-) +Merging ftrace/for-next (97f8827a8c79 ftracetest: Use proper logic to find process PID) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (b8ec0e6dbecf documentation: Clarify limited control-dependency scope) +$ git merge rcu/rcu/next +Resolved 'kernel/rcu/tree.c' using previous resolution. +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/fair.c +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f746cfadaf54] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/Requirements.html | 35 ++ + Documentation/RCU/stallwarn.txt | 2 +- + Documentation/RCU/whatisRCU.txt | 3 + + Documentation/memory-barriers.txt | 41 ++ + Documentation/sysctl/kernel.txt | 12 + + include/linux/kernel.h | 1 + + include/linux/rcupdate.h | 23 +- + include/linux/torture.h | 4 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcuperf.c | 21 +- + kernel/rcu/rcutorture.c | 9 +- + kernel/rcu/tree.c | 588 +----------------- + kernel/rcu/tree.h | 15 + + kernel/rcu/tree_exp.h | 656 +++++++++++++++++++++ + kernel/rcu/tree_plugin.h | 95 +-- + kernel/rcu/update.c | 7 +- + kernel/rcu/waketorture.c | 537 +++++++++++++++++ + kernel/sched/fair.c | 2 +- + kernel/sysctl.c | 11 + + kernel/torture.c | 176 ++++-- + lib/Kconfig.debug | 51 +- + .../testing/selftests/rcutorture/bin/functions.sh | 12 +- + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 ++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 34 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 4 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + tools/testing/selftests/rcutorture/doc/initrd.txt | 22 + + 35 files changed, 1702 insertions(+), 796 deletions(-) + create mode 100644 kernel/rcu/tree_exp.h + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +$ git am -3 ../patches/0001-rcu-merge-fix-for-kernel-rcu-tree_exp.h.patch +Applying: rcu: merge fix for kernel/rcu/tree_exp.h +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/rcu/tree_exp.h +$ git add -A . +$ git commit -v -a --amend +[master 23a1ae7de1ad] Merge remote-tracking branch 'rcu/rcu/next' + Date: Tue Jun 14 14:31:41 2016 +1000 +Merging kvm/linux-next (dca4d728773a kvm/x86: remove unnecessary header file inclusion) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'recursive' strategy. + arch/x86/kvm/i8254.c | 4 ++- + arch/x86/kvm/iommu.c | 2 -- + arch/x86/kvm/x86.c | 80 ++++++++++++++++++++++++++++++---------------------- + 3 files changed, 50 insertions(+), 36 deletions(-) +Merging kvm-arm/next (35a2d58588f0 KVM: arm/arm64: vgic-new: Synchronize changes to active state) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (a7e19ab55ffd KVM: s390: handle missing storage-key facility) +$ git merge kvms390/next +Recorded preimage for 'arch/s390/hypfs/hypfs_diag.c' +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/diag.h +Auto-merging arch/s390/hypfs/hypfs_diag.c +CONFLICT (content): Merge conflict in arch/s390/hypfs/hypfs_diag.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/s390/hypfs/hypfs_diag.c'. +[master f0bd84bfe2f2] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 2 + + Documentation/virtual/kvm/devices/vm.txt | 87 +++++- + arch/s390/hypfs/hypfs_diag.c | 375 +++++++----------------- + arch/s390/include/asm/cpacf.h | 10 + + arch/s390/include/asm/diag.h | 149 ++++++++++ + arch/s390/include/asm/kvm_host.h | 10 +- + arch/s390/include/asm/page.h | 7 +- + arch/s390/include/asm/pgtable.h | 7 +- + arch/s390/include/asm/sclp.h | 23 +- + arch/s390/include/uapi/asm/kvm.h | 29 ++ + arch/s390/include/uapi/asm/sie.h | 1 + + arch/s390/kernel/diag.c | 37 +++ + arch/s390/kvm/Makefile | 2 +- + arch/s390/kvm/diag.c | 5 + + arch/s390/kvm/gaccess.c | 152 +++++----- + arch/s390/kvm/intercept.c | 15 + + arch/s390/kvm/interrupt.c | 26 +- + arch/s390/kvm/kvm-s390.c | 255 +++++++++++++++-- + arch/s390/kvm/kvm-s390.h | 9 + + arch/s390/kvm/priv.c | 217 +++++++++++--- + arch/s390/kvm/sthyi.c | 471 +++++++++++++++++++++++++++++++ + arch/s390/kvm/trace.h | 49 +++- + arch/s390/mm/pgtable.c | 106 +++++-- + drivers/s390/char/sclp_early.c | 12 +- + drivers/s390/char/sclp_ocf.c | 23 +- + 25 files changed, 1620 insertions(+), 459 deletions(-) + create mode 100644 arch/s390/kvm/sthyi.c +$ git am -3 ../patches/s390-fix-merge-conflict-in-arch-s390-kvm-kvm-s390.c.patch +Applying: s390: fix merge conflict in arch/s390/kvm/kvm-s390.c +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kvm/kvm-s390.c +$ git add -A . +$ git commit -v -a --amend +[master 752a6f308e6d] Merge remote-tracking branch 'kvms390/next' + Date: Tue Jun 14 14:46:25 2016 +1000 +$ git am -3 ../patches/0001-s390-merge-fix-up-for-__diag204-move.patch +Applying: s390: merge fix up for __diag204 move +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/kernel/diag.c +$ git add -A . +$ git commit -v -a --amend +[master 8b516b94369a] Merge remote-tracking branch 'kvms390/next' + Date: Tue Jun 14 14:46:25 2016 +1000 +Merging xen-tip/linux-next (bdadcaf2a7c1 xen: remove incorrect forward declaration) +$ git merge xen-tip/linux-next +Auto-merging drivers/xen/Makefile +Auto-merging drivers/of/fdt.c +Auto-merging arch/arm/kernel/setup.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/xen.txt | 35 +++++ + arch/arm/include/asm/xen/xen-ops.h | 6 + + arch/arm/kernel/setup.c | 2 +- + arch/arm/xen/Makefile | 1 + + arch/arm/xen/efi.c | 40 ++++++ + arch/arm/xen/enlighten.c | 125 ++++++++++++---- + arch/arm64/include/asm/xen/xen-ops.h | 6 + + arch/arm64/kernel/setup.c | 3 +- + arch/arm64/xen/Makefile | 1 + + arch/x86/xen/efi.c | 111 +++++++++++++++ + arch/x86/xen/grant-table.c | 57 +------- + drivers/acpi/scan.c | 74 ++++++++++ + drivers/firmware/efi/arm-runtime.c | 5 + + drivers/firmware/efi/efi.c | 81 ++++++++--- + drivers/of/fdt.c | 13 ++ + drivers/xen/Kconfig | 2 +- + drivers/xen/Makefile | 1 + + drivers/xen/arm-device.c | 196 ++++++++++++++++++++++++++ + drivers/xen/balloon.c | 28 ++-- + drivers/xen/efi.c | 173 +++++------------------ + drivers/xen/xlate_mmu.c | 77 ++++++++++ + include/linux/of_fdt.h | 2 + + include/xen/interface/hvm/params.h | 40 +++++- + include/xen/interface/memory.h | 1 + + include/xen/xen-ops.h | 32 +++-- + 25 files changed, 849 insertions(+), 263 deletions(-) + create mode 100644 arch/arm/include/asm/xen/xen-ops.h + create mode 100644 arch/arm/xen/efi.c + create mode 100644 arch/arm64/include/asm/xen/xen-ops.h + create mode 100644 drivers/xen/arm-device.c +Merging percpu/for-next (6710e594f71c percpu: fix synchronization between synchronous map extension and chunk destruction) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu.c | 73 +++++++++++++++++++++++++++++++++++++------------------------ + 1 file changed, 44 insertions(+), 29 deletions(-) +Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (b740d2e9233c platform/x86: Add PMC Driver for Intel Core SoC) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (3c13ab1d96e1 HSI: cmt_speech: Fix double spin_lock) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 4 ++-- + drivers/hsi/hsi.c | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) +Merging leds/for-next (818b02a6f689 MAINTAINERS: Add file patterns for led device tree bindings) +$ git merge leds/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.txt | 4 ++-- + MAINTAINERS | 1 + + drivers/leds/led-core.c | 9 ++++++--- + drivers/leds/trigger/ledtrig-heartbeat.c | 31 +++++++++++++++++++++++++++++++ + include/linux/leds.h | 23 ++++++++++++----------- + 5 files changed, 52 insertions(+), 16 deletions(-) +Merging ipmi/for-next (4e80ad011c9c ipmi: Remove smi_msg from waiting_rcv_msgs list before handle_one_recv_msg()) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (5edb56491d48 Linux 4.7-rc3) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (5edb56491d48 Linux 4.7-rc3) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (76d15c8fba65 ehci-platform: Add support for shared reset controllers) +$ git merge usb/usb-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/atmel-usb.txt | 6 +- + Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 2 +- + drivers/usb/class/cdc-acm.c | 2 +- + drivers/usb/host/ehci-platform.c | 37 +++++----- + drivers/usb/host/ohci-at91.c | 80 +++++++++++++++++++++- + drivers/usb/host/ohci-platform.c | 43 ++++++------ + drivers/usb/image/microtek.h | 6 +- + drivers/usb/misc/usb3503.c | 25 +++++++ + drivers/usb/usbip/usbip_common.h | 2 +- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + include/soc/at91/at91_sfr.h | 29 ++++++++ + 12 files changed, 189 insertions(+), 47 deletions(-) + create mode 100644 include/soc/at91/at91_sfr.h +Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (af8c34ce6ae3 Linux 4.7-rc2) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging staging/staging-next (21ca52bb749e staging: lustre: lnet: Replace semaphore ln_rc_signal with completion) +$ git merge staging/staging-next +Recorded preimage for 'drivers/iio/industrialio-trigger.c' +Auto-merging tools/iio/iio_generic_buffer.c +Auto-merging include/linux/iio/common/st_sensors.h +CONFLICT (modify/delete): drivers/staging/lustre/lustre/llite/lloop.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/lustre/lustre/llite/lloop.c left in tree. +Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +Auto-merging drivers/iio/proximity/as3935.c +Auto-merging drivers/iio/pressure/st_pressure_core.c +Auto-merging drivers/iio/pressure/bmp280.c +Auto-merging drivers/iio/magnetometer/st_magn_core.c +Auto-merging drivers/iio/industrialio-trigger.c +CONFLICT (content): Merge conflict in drivers/iio/industrialio-trigger.c +Auto-merging drivers/iio/imu/bmi160/bmi160_core.c +Auto-merging drivers/iio/humidity/am2315.c +Auto-merging drivers/iio/gyro/st_gyro_core.c +Auto-merging drivers/iio/common/st_sensors/st_sensors_core.c +Auto-merging drivers/iio/common/st_sensors/st_sensors_buffer.c +Auto-merging drivers/iio/accel/st_accel_core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/lustre/lustre/llite/lloop.c +drivers/staging/lustre/lustre/llite/lloop.c: needs merge +rm 'drivers/staging/lustre/lustre/llite/lloop.c' +$ git commit -v -a +Recorded resolution for 'drivers/iio/industrialio-trigger.c'. +[master b2cce2e7e195] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-iio | 13 + + Documentation/ABI/testing/sysfs-bus-iio | 7 + + .../ABI/testing/sysfs-bus-iio-health-afe440x | 63 +- + .../bindings/iio/chemical/atlas,ec-sm.txt | 22 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + MAINTAINERS | 2 + + drivers/iio/Kconfig | 8 + + drivers/iio/Makefile | 1 + + drivers/iio/accel/Kconfig | 20 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/bma220_spi.c | 338 ++ + drivers/iio/accel/mma7660.c | 277 ++ + drivers/iio/accel/mma8452.c | 185 +- + drivers/iio/accel/st_accel_core.c | 12 +- + drivers/iio/adc/ad7266.c | 7 +- + drivers/iio/adc/ad7476.c | 11 +- + drivers/iio/adc/ad7791.c | 36 +- + drivers/iio/adc/ad7793.c | 32 +- + drivers/iio/adc/ad7887.c | 11 +- + drivers/iio/adc/ad7923.c | 11 +- + drivers/iio/adc/ad799x.c | 24 +- + drivers/iio/adc/mxs-lradc.c | 34 +- + drivers/iio/adc/nau7802.c | 19 + + drivers/iio/adc/ti-ads1015.c | 128 +- + drivers/iio/adc/ti_am335x_adc.c | 22 +- + drivers/iio/chemical/Kconfig | 8 +- + drivers/iio/chemical/atlas-ph-sensor.c | 267 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 3 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 29 +- + drivers/iio/common/st_sensors/st_sensors_i2c.c | 4 +- + drivers/iio/dummy/Kconfig | 1 + + drivers/iio/dummy/iio_simple_dummy.c | 102 +- + drivers/iio/gyro/st_gyro_core.c | 12 +- + drivers/iio/health/afe4403.c | 299 +- + drivers/iio/health/afe4404.c | 308 +- + drivers/iio/health/afe440x.h | 48 +- + drivers/iio/humidity/am2315.c | 1 + + drivers/iio/humidity/htu21.c | 1 + + drivers/iio/imu/bmi160/bmi160_core.c | 27 + + drivers/iio/industrialio-core.c | 1 + + drivers/iio/industrialio-sw-device.c | 182 + + drivers/iio/industrialio-trigger.c | 13 +- + drivers/iio/light/jsa1212.c | 3 - + drivers/iio/magnetometer/Kconfig | 2 + + drivers/iio/magnetometer/ak8975.c | 20 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 3 + + drivers/iio/magnetometer/bmc150_magn_spi.c | 3 + + drivers/iio/magnetometer/st_magn_core.c | 12 +- + drivers/iio/potentiometer/Kconfig | 11 + + drivers/iio/potentiometer/Makefile | 1 + + drivers/iio/potentiometer/max5487.c | 161 + + drivers/iio/potentiometer/tpl0102.c | 4 - + drivers/iio/pressure/Kconfig | 5 +- + drivers/iio/pressure/bmp280.c | 200 +- + drivers/iio/pressure/hp206c.c | 1 + + drivers/iio/pressure/ms5637.c | 1 + + drivers/iio/pressure/st_pressure.h | 1 + + drivers/iio/pressure/st_pressure_core.c | 105 +- + drivers/iio/pressure/st_pressure_i2c.c | 4 + + drivers/iio/pressure/st_pressure_spi.c | 1 + + drivers/iio/proximity/as3935.c | 1 - + drivers/iio/temperature/tsys02d.c | 1 + + drivers/iio/trigger/Kconfig | 12 + + drivers/iio/trigger/Makefile | 1 + + drivers/iio/trigger/iio-trig-loop.c | 143 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/ks7010/Kconfig | 10 + + drivers/staging/ks7010/Makefile | 5 + + drivers/staging/ks7010/TODO | 37 + + drivers/staging/ks7010/eap_packet.h | 129 + + drivers/staging/ks7010/ks7010_config.c | 500 +++ + drivers/staging/ks7010/ks7010_sdio.c | 1234 +++++++ + drivers/staging/ks7010/ks7010_sdio.h | 148 + + drivers/staging/ks7010/ks79xx.cfg | 116 + + drivers/staging/ks7010/ks_hostif.c | 2760 +++++++++++++++ + drivers/staging/ks7010/ks_hostif.h | 644 ++++ + drivers/staging/ks7010/ks_wlan.h | 503 +++ + drivers/staging/ks7010/ks_wlan_ioctl.h | 67 + + drivers/staging/ks7010/ks_wlan_net.c | 3544 ++++++++++++++++++++ + drivers/staging/ks7010/michael_mic.c | 139 + + drivers/staging/ks7010/michael_mic.h | 26 + + .../staging/lustre/include/linux/lnet/lib-types.h | 3 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 9 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 8 + + .../lustre/lnet/libcfs/linux/linux-crypto.c | 1 + + drivers/staging/lustre/lnet/lnet/net_fault.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 9 +- + drivers/staging/lustre/lustre/Kconfig | 6 - + drivers/staging/lustre/lustre/llite/Makefile | 3 - + drivers/staging/lustre/lustre/llite/dir.c | 12 +- + drivers/staging/lustre/lustre/llite/file.c | 8 + + .../staging/lustre/lustre/llite/llite_internal.h | 11 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 5 + + drivers/staging/lustre/lustre/llite/lloop.c | 883 ----- + drivers/staging/lustre/lustre/llite/rw.c | 145 +- + drivers/staging/lustre/lustre/llite/rw26.c | 17 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 8 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 12 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 2 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 2 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 5 - + drivers/staging/lustre/lustre/osc/osc_page.c | 22 - + drivers/staging/lustre/lustre/ptlrpc/sec.c | 3 + + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 8 +- + drivers/staging/unisys/visorbus/iovmcall_gnuc.h | 4 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 12 +- + drivers/staging/unisys/visorbus/visorchipset.c | 2 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 394 +-- + drivers/staging/unisys/visorinput/visorinput.c | 2 +- + drivers/staging/unisys/visornic/visornic_main.c | 73 +- + include/linux/iio/common/st_sensors.h | 4 +- + include/linux/iio/sw_device.h | 70 + + include/uapi/linux/iio/types.h | 1 + + tools/iio/Makefile | 21 +- + .../iio/{generic_buffer.c => iio_generic_buffer.c} | 261 +- + 118 files changed, 13016 insertions(+), 2176 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ec-sm.txt + create mode 100644 drivers/iio/accel/bma220_spi.c + create mode 100644 drivers/iio/accel/mma7660.c + create mode 100644 drivers/iio/industrialio-sw-device.c + create mode 100644 drivers/iio/potentiometer/max5487.c + create mode 100644 drivers/iio/trigger/iio-trig-loop.c + create mode 100644 drivers/staging/ks7010/Kconfig + create mode 100644 drivers/staging/ks7010/Makefile + create mode 100644 drivers/staging/ks7010/TODO + create mode 100644 drivers/staging/ks7010/eap_packet.h + create mode 100644 drivers/staging/ks7010/ks7010_config.c + create mode 100644 drivers/staging/ks7010/ks7010_sdio.c + create mode 100644 drivers/staging/ks7010/ks7010_sdio.h + create mode 100644 drivers/staging/ks7010/ks79xx.cfg + create mode 100644 drivers/staging/ks7010/ks_hostif.c + create mode 100644 drivers/staging/ks7010/ks_hostif.h + create mode 100644 drivers/staging/ks7010/ks_wlan.h + create mode 100644 drivers/staging/ks7010/ks_wlan_ioctl.h + create mode 100644 drivers/staging/ks7010/ks_wlan_net.c + create mode 100644 drivers/staging/ks7010/michael_mic.c + create mode 100644 drivers/staging/ks7010/michael_mic.h + delete mode 100644 drivers/staging/lustre/lustre/llite/lloop.c + create mode 100644 include/linux/iio/sw_device.h + rename tools/iio/{generic_buffer.c => iio_generic_buffer.c} (76%) +Merging char-misc/char-misc-next (c0ff9019ee64 mei: drop wr_msg from the mei_dev structure) +$ git merge char-misc/char-misc-next +Auto-merging drivers/misc/lkdtm_core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/misc/Makefile | 10 + + drivers/misc/lkdtm.h | 6 + + drivers/misc/{lkdtm.c => lkdtm_core.c} | 333 +++++++++++++++++++++++++++++++-- + drivers/misc/lkdtm_rodata.c | 10 + + drivers/misc/mei/hbm.c | 137 +++++++------- + drivers/misc/mei/mei_dev.h | 10 +- + 7 files changed, 409 insertions(+), 99 deletions(-) + create mode 100644 drivers/misc/lkdtm.h + rename drivers/misc/{lkdtm.c => lkdtm_core.c} (72%) + create mode 100644 drivers/misc/lkdtm_rodata.c +Merging extcon/extcon-next (4239b7f76be3 Merge branch 'ib-extcon-powersupply-4.8' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into extcon-next) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 3 +- + drivers/extcon/extcon-usb-gpio.c | 32 ++-- + drivers/extcon/extcon.c | 201 +++------------------ + drivers/power/axp288_charger.c | 77 +++++--- + include/linux/extcon.h | 80 +++----- + 5 files changed, 120 insertions(+), 273 deletions(-) +Merging cgroup/for-next (332d8a2fd141 cgroup: set css->id to -1 during init) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging scsi/for-next (4d8e355acc29 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt | 26 ++ + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 4 +- + Documentation/scsi/scsi_eh.txt | 8 +- + MAINTAINERS | 7 + + drivers/ata/libata-eh.c | 2 +- + drivers/scsi/Kconfig | 2 +- + drivers/scsi/aacraid/commctrl.c | 7 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 2 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 73 +++-- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 20 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_error.c | 4 +- + drivers/scsi/snic/snic_fwint.h | 2 +- + drivers/scsi/storvsc_drv.c | 2 + + drivers/scsi/ufs/Kconfig | 16 ++ + drivers/scsi/ufs/Makefile | 2 + + drivers/scsi/ufs/tc-dwc-g210-pci.c | 181 ++++++++++++ + drivers/scsi/ufs/tc-dwc-g210-pltfrm.c | 113 ++++++++ + drivers/scsi/ufs/tc-dwc-g210.c | 319 +++++++++++++++++++++ + drivers/scsi/ufs/tc-dwc-g210.h | 19 ++ + drivers/scsi/ufs/ufshcd-dwc.c | 154 ++++++++++ + drivers/scsi/ufs/ufshcd-dwc.h | 26 ++ + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 89 +++--- + drivers/scsi/ufs/ufshcd.h | 7 + + drivers/scsi/ufs/ufshci-dwc.h | 36 +++ + drivers/scsi/ufs/ufshci.h | 11 + + drivers/scsi/ufs/unipro.h | 39 +++ + 31 files changed, 1087 insertions(+), 97 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/tc-dwc-g210-pltfrm.txt + create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pci.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210-pltfrm.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210.c + create mode 100644 drivers/scsi/ufs/tc-dwc-g210.h + create mode 100644 drivers/scsi/ufs/ufshcd-dwc.c + create mode 100644 drivers/scsi/ufs/ufshcd-dwc.h + create mode 100644 drivers/scsi/ufs/ufshci-dwc.h +Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (5219d6530ef0 ata: Use IS_ENABLED() instead of checking for built-in or module) +$ git merge libata/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/ata/ahci.c | 2 +- + drivers/ata/pata_atiixp.c | 4 ++-- + drivers/ata/pata_marvell.c | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) +Merging pinctrl/for-next (fe9f516997c6 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio_oxnas.txt | 47 + + .../devicetree/bindings/pinctrl/oxnas,pinctrl.txt | 57 ++ + .../bindings/pinctrl/pinctrl-max77620.txt | 127 +++ + drivers/gpio/gpio-tegra.c | 9 +- + drivers/pinctrl/Kconfig | 21 + + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 6 +- + drivers/pinctrl/core.c | 25 +- + drivers/pinctrl/core.h | 2 + + drivers/pinctrl/freescale/pinctrl-imx.c | 30 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 163 ++- + drivers/pinctrl/pinconf-generic.c | 14 +- + drivers/pinctrl/pinconf.c | 8 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 6 +- + drivers/pinctrl/pinctrl-digicolor.c | 2 + + drivers/pinctrl/pinctrl-max77620.c | 678 +++++++++++++ + drivers/pinctrl/pinctrl-oxnas.c | 846 ++++++++++++++++ + drivers/pinctrl/pinctrl-single.c | 3 + + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 1 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 31 +- + drivers/pinctrl/tegra/Makefile | 2 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 6 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 4 +- + drivers/pinctrl/uniphier/Kconfig | 20 +- + drivers/pinctrl/uniphier/Makefile | 2 + + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 298 +++--- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 956 ++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 1037 ++++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 480 +++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 595 +++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 787 ++++++++------- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 653 ++++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 581 +++++------ + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 441 +++++---- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 59 +- + 43 files changed, 6119 insertions(+), 1929 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio_oxnas.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/oxnas,pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-max77620.txt + create mode 100644 drivers/pinctrl/pinctrl-max77620.c + create mode 100644 drivers/pinctrl/pinctrl-oxnas.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c +Merging vhost/linux-next (139ab4d4e68b tools/virtio: add noring tool) +$ git merge vhost/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + tools/virtio/ringtest/Makefile | 4 ++- + tools/virtio/ringtest/README | 4 +++ + tools/virtio/ringtest/noring.c | 69 +++++++++++++++++++++++++++++++++++++ + tools/virtio/ringtest/run-on-all.sh | 4 +-- + 5 files changed, 79 insertions(+), 3 deletions(-) + create mode 100644 tools/virtio/ringtest/noring.c +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (a13c8bdda15e Merge branch 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging gpio/for-next (32d92ac3d936 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../bindings/gpio/cirrus,clps711x-mctrl-gpio.txt | 4 +- + .../devicetree/bindings/gpio/gpio-clps711x.txt | 4 +- + .../devicetree/bindings/gpio/gpio-max77620.txt | 25 ++ + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + arch/hexagon/Kconfig | 3 +- + arch/ia64/Kconfig | 1 - + arch/microblaze/Kconfig | 1 - + arch/openrisc/Kconfig | 2 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/platforms/40x/Kconfig | 2 +- + arch/powerpc/platforms/44x/Kconfig | 2 +- + arch/powerpc/platforms/512x/Kconfig | 1 - + arch/powerpc/platforms/83xx/Kconfig | 3 - + arch/powerpc/platforms/85xx/Kconfig | 4 +- + arch/powerpc/platforms/86xx/Kconfig | 7 +- + arch/powerpc/platforms/8xx/Kconfig | 2 +- + arch/powerpc/platforms/Kconfig | 8 +- + arch/sh/Kconfig | 11 +- + arch/sh/boards/Kconfig | 17 +- + arch/sh/boards/mach-highlander/Kconfig | 2 +- + arch/sh/boards/mach-rsk/Kconfig | 6 +- + arch/unicore32/Kconfig | 2 +- + drivers/gpio/Kconfig | 11 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-clps711x.c | 10 +- + drivers/gpio/gpio-max77620.c | 312 +++++++++++++++++++++ + drivers/gpio/gpio-menz127.c | 1 - + drivers/gpio/gpio-mmio.c | 51 +++- + drivers/gpio/gpio-palmas.c | 1 - + drivers/gpio/gpio-pca953x.c | 19 +- + drivers/gpio/gpio-pcf857x.c | 9 + + drivers/gpio/gpio-rdc321x.c | 1 - + drivers/gpio/gpio-sch311x.c | 1 - + drivers/gpio/gpio-stmpe.c | 18 +- + drivers/gpio/gpio-syscon.c | 4 +- + drivers/gpio/gpio-tc3589x.c | 1 - + drivers/gpio/gpio-tps6586x.c | 1 - + drivers/gpio/gpio-tps65910.c | 1 - + drivers/gpio/gpio-viperboard.c | 1 - + drivers/gpio/gpio-wm831x.c | 1 - + drivers/gpio/gpio-wm8350.c | 1 - + drivers/gpio/gpio-wm8994.c | 1 - + drivers/gpio/gpio-xilinx.c | 48 ++++ + drivers/gpio/gpio-xlp.c | 52 +++- + drivers/gpio/gpiolib-of.c | 1 + + drivers/pinctrl/pinctrl-xway.c | 5 +- + 46 files changed, 564 insertions(+), 97 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max77620.txt + create mode 100644 drivers/gpio/gpio-max77620.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 (52e0c06dc7b4 pwm: Remove gratuitous blank line) +$ git merge pwm/for-next +Recorded preimage for 'Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt' +Auto-merging Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt'. +[master edf8f5c94862] Merge remote-tracking branch 'pwm/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/pwm/core.c | 3 ++- + drivers/pwm/pwm-lpss.c | 14 +++++++------- + drivers/pwm/pwm-tiecap.c | 9 +++++++++ + drivers/pwm/pwm-tiehrpwm.c | 9 +++++++++ + drivers/pwm/sysfs.c | 2 +- + include/linux/pwm.h | 4 +++- + 6 files changed, 31 insertions(+), 10 deletions(-) +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +++++++++++ + drivers/dma-buf/Kconfig | 15 ++++++++++++--- + 2 files changed, 23 insertions(+), 3 deletions(-) +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (2dcd0af568b0 Linux 4.6) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (72ad679aa718 clk: nxp: Select MFD_SYSCON for creg driver) +$ git merge clk/clk-next +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (1a695a905c18 Linux 4.7-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times) +$ git merge y2038/y2038 +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + include/linux/fs.h | 29 ++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 5 deletions(-) +Merging luto-misc/next (6436d4c1a83c x86/vdso: Fail the build if the vdso image has no dynamic section) +$ git merge luto-misc/next +Merge made by the 'recursive' strategy. + arch/x86/entry/vdso/vdso2c.h | 3 +++ + 1 file changed, 3 insertions(+) +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (706700160586 coresight: Fix erroneous memset in tmc_read_unprepare_etr) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etm4x.c | 8 ++++---- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 11 ++++------- + drivers/hwtracing/coresight/coresight.c | 15 +++++++++------ + 3 files changed, 17 insertions(+), 17 deletions(-) +Merging rtc/rtc-next (c361db5c2c64 x86: include linux/ratelimit.h in nmi.c) +$ git merge rtc/rtc-next +Removing include/asm-generic/rtc.h +Removing drivers/char/genrtc.c +Removing arch/x86/include/asm/rtc.h +Removing arch/sh/include/asm/mc146818rtc.h +Auto-merging arch/powerpc/platforms/Kconfig +Removing arch/powerpc/include/asm/rtc.h +Auto-merging arch/parisc/kernel/time.c +Removing arch/parisc/include/asm/rtc.h +Removing arch/parisc/include/asm/mc146818rtc.h +Removing arch/m68k/include/asm/rtc.h +Removing arch/ia64/include/asm/mc146818rtc.h +Removing arch/h8300/include/asm/mc146818rtc.h +Removing arch/frv/include/asm/mc146818rtc.h +Removing arch/alpha/include/asm/rtc.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/alpha/include/asm/rtc.h | 1 - + arch/alpha/kernel/core_marvel.c | 1 - + arch/alpha/kernel/rtc.c | 6 +- + arch/frv/include/asm/mc146818rtc.h | 16 - + arch/h8300/include/asm/mc146818rtc.h | 9 - + arch/ia64/include/asm/mc146818rtc.h | 10 - + arch/m68k/amiga/config.c | 1 - + arch/m68k/apollo/config.c | 1 - + arch/m68k/bvme6000/config.c | 1 - + arch/m68k/hp300/config.c | 2 +- + arch/m68k/include/asm/rtc.h | 79 ---- + arch/m68k/kernel/time.c | 48 ++- + arch/m68k/mac/config.c | 3 +- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mvme147/config.c | 1 - + arch/m68k/mvme16x/config.c | 1 - + arch/m68k/q40/config.c | 2 +- + arch/m68k/sun3/config.c | 1 - + arch/m68k/sun3/intersil.c | 2 +- + arch/m68k/sun3x/time.c | 2 +- + arch/mips/sni/time.c | 1 - + arch/mn10300/include/asm/rtc.h | 2 - + arch/mn10300/kernel/rtc.c | 2 +- + arch/mn10300/proc-mn103e010/proc-init.c | 2 + + arch/mn10300/proc-mn2ws0050/proc-init.c | 1 + + arch/parisc/include/asm/mc146818rtc.h | 9 - + arch/parisc/include/asm/rtc.h | 131 ------- + arch/parisc/kernel/time.c | 36 +- + arch/powerpc/include/asm/rtc.h | 78 ---- + arch/powerpc/kernel/time.c | 29 +- + arch/powerpc/platforms/Kconfig | 11 + + arch/powerpc/platforms/ps3/time.c | 2 +- + arch/sh/include/asm/mc146818rtc.h | 7 - + arch/sh/include/asm/rtc.h | 11 - + arch/sh/kernel/time.c | 33 +- + arch/sparc/include/asm/io_32.h | 10 - + arch/x86/include/asm/mc146818rtc.h | 1 - + arch/x86/include/asm/rtc.h | 1 - + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/nmi.c | 1 + + arch/x86/kernel/rtc.c | 3 +- + arch/x86/platform/efi/efi.c | 1 - + arch/x86/platform/efi/efi_64.c | 1 + + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 1 + + drivers/acpi/acpi_cmos_rtc.c | 2 +- + drivers/base/power/trace.c | 6 +- + drivers/char/Kconfig | 26 -- + drivers/char/Makefile | 1 - + drivers/char/genrtc.c | 539 --------------------------- + drivers/rtc/Kconfig | 12 + + drivers/rtc/Makefile | 1 + + drivers/rtc/interface.c | 28 +- + drivers/rtc/rtc-cmos.c | 12 +- + drivers/rtc/rtc-ds1685.c | 34 +- + drivers/rtc/rtc-efi.c | 6 + + drivers/rtc/rtc-generic.c | 36 +- + drivers/rtc/rtc-max6916.c | 164 ++++++++ + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-pcf2123.c | 4 +- + include/asm-generic/rtc.h | 247 ------------ + include/linux/mc146818rtc.h | 194 ++++++++++ + 62 files changed, 605 insertions(+), 1275 deletions(-) + delete mode 100644 arch/alpha/include/asm/rtc.h + delete mode 100644 arch/frv/include/asm/mc146818rtc.h + delete mode 100644 arch/h8300/include/asm/mc146818rtc.h + delete mode 100644 arch/ia64/include/asm/mc146818rtc.h + delete mode 100644 arch/m68k/include/asm/rtc.h + delete mode 100644 arch/parisc/include/asm/mc146818rtc.h + delete mode 100644 arch/parisc/include/asm/rtc.h + delete mode 100644 arch/powerpc/include/asm/rtc.h + delete mode 100644 arch/sh/include/asm/mc146818rtc.h + delete mode 100644 arch/x86/include/asm/rtc.h + delete mode 100644 drivers/char/genrtc.c + create mode 100644 drivers/rtc/rtc-max6916.c + delete mode 100644 include/asm-generic/rtc.h +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (36092ee8ba69 Merge branch 'for-4.7/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging akpm-current/current (8e2bc198f1d4 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'include/linux/bitmap.h' +Auto-merging net/unix/af_unix.c +Auto-merging mm/swap.c +Auto-merging mm/page-writeback.c +Auto-merging mm/memcontrol.c +Auto-merging mm/kasan/kasan.c +Auto-merging mm/hugetlb.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/fs.h +Auto-merging include/linux/bitmap.h +CONFLICT (content): Merge conflict in include/linux/bitmap.h +Auto-merging fs/orangefs/inode.c +Auto-merging fs/nilfs2/segbuf.c +Auto-merging fs/nilfs2/mdt.c +Auto-merging fs/nilfs2/gcinode.c +Auto-merging fs/nilfs2/btree.c +Auto-merging fs/mpage.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/cifs/file.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/block/zram/zram_drv.c +Removing drivers/block/zram/zcomp_lzo.h +Removing drivers/block/zram/zcomp_lzo.c +Removing drivers/block/zram/zcomp_lz4.h +Removing drivers/block/zram/zcomp_lz4.c +Auto-merging arch/x86/platform/efi/efi_64.c +Auto-merging arch/s390/mm/fault.c +Auto-merging arch/powerpc/include/asm/nohash/64/pgalloc.h +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/configs/sunxi_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/keystone_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/boot/dts/keystone.dtsi +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/bitmap.h'. +[master f3f2336baff1] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/blockdev/zram.txt | 82 +- + Documentation/filesystems/Locking | 14 +- + Documentation/filesystems/proc.txt | 9 + + Documentation/filesystems/vfs.txt | 11 + + Documentation/kernel-parameters.txt | 6 +- + Documentation/vm/page_migration | 107 +- + Documentation/vm/transhuge.txt | 128 +- + Documentation/vm/unevictable-lru.txt | 21 + + arch/alpha/include/asm/pgalloc.h | 4 +- + arch/alpha/mm/fault.c | 2 +- + arch/arc/include/asm/pgalloc.h | 4 +- + arch/arc/mm/fault.c | 2 +- + arch/arm/boot/dts/keystone.dtsi | 8 + + arch/arm/configs/axm55xx_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/bcm_defconfig | 2 +- + arch/arm/configs/colibri_pxa270_defconfig | 2 +- + arch/arm/configs/colibri_pxa300_defconfig | 2 +- + arch/arm/configs/dove_defconfig | 2 +- + arch/arm/configs/efm32_defconfig | 2 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/ezx_defconfig | 2 +- + arch/arm/configs/h5000_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imote2_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/configs/pxa168_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm/configs/pxa910_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/raumfeld_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/u300_defconfig | 2 +- + arch/arm/configs/u8500_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/configs/xcep_defconfig | 2 +- + arch/arm/configs/zx_defconfig | 2 +- + arch/arm/include/asm/kexec.h | 24 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgalloc.h | 4 +- + arch/arm/include/asm/tlb.h | 29 +- + arch/arm/kernel/machine_kexec.c | 2 +- + arch/arm/kernel/setup.c | 39 +- + arch/arm/mm/dma-mapping.c | 26 +- + arch/arm/mm/fault.c | 2 +- + arch/arm/mm/pgd.c | 2 +- + arch/arm64/configs/defconfig | 2 +- + arch/arm64/include/asm/pgalloc.h | 2 +- + arch/arm64/mm/dma-mapping.c | 6 +- + arch/arm64/mm/fault.c | 2 +- + arch/avr32/include/asm/pgalloc.h | 6 +- + arch/avr32/mm/fault.c | 2 +- + arch/cris/include/asm/pgalloc.h | 4 +- + arch/cris/mm/fault.c | 2 +- + arch/frv/mm/fault.c | 2 +- + arch/frv/mm/pgalloc.c | 6 +- + arch/hexagon/include/asm/pgalloc.h | 4 +- + arch/hexagon/mm/vm_fault.c | 2 +- + arch/ia64/include/asm/tlb.h | 31 +- + arch/ia64/kernel/machine_kexec.c | 2 +- + arch/ia64/mm/fault.c | 2 +- + arch/m32r/mm/fault.c | 2 +- + arch/m68k/include/asm/mcf_pgalloc.h | 4 +- + arch/m68k/include/asm/motorola_pgalloc.h | 4 +- + arch/m68k/include/asm/sun3_pgalloc.h | 4 +- + arch/m68k/mm/fault.c | 2 +- + arch/metag/include/asm/pgalloc.h | 5 +- + arch/metag/mm/fault.c | 2 +- + arch/microblaze/include/asm/pgalloc.h | 4 +- + arch/microblaze/mm/fault.c | 2 +- + arch/microblaze/mm/pgtable.c | 3 +- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/bmips_be_defconfig | 2 +- + arch/mips/configs/bmips_stb_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 2 +- + arch/mips/configs/nlm_xlp_defconfig | 2 +- + arch/mips/configs/nlm_xlr_defconfig | 2 +- + arch/mips/configs/pistachio_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/rt305x_defconfig | 2 +- + arch/mips/configs/xway_defconfig | 2 +- + arch/mips/include/asm/pgalloc.h | 6 +- + arch/mips/mm/fault.c | 2 +- + arch/mn10300/mm/fault.c | 2 +- + arch/mn10300/mm/pgtable.c | 6 +- + arch/nios2/include/asm/pgalloc.h | 5 +- + arch/nios2/mm/fault.c | 2 +- + arch/openrisc/include/asm/pgalloc.h | 2 +- + arch/openrisc/mm/fault.c | 2 +- + arch/openrisc/mm/ioremap.c | 2 +- + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/parisc/include/asm/pgalloc.h | 7 +- + arch/parisc/mm/fault.c | 2 +- + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + arch/powerpc/configs/44x/warp_defconfig | 2 +- + arch/powerpc/configs/52xx/cm5200_defconfig | 2 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 2 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 2 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 2 +- + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/mpc5200_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +- + arch/powerpc/include/asm/jump_label.h | 1 + + arch/powerpc/include/asm/nohash/64/pgalloc.h | 8 +- + arch/powerpc/include/asm/pgtable.h | 6 +- + arch/powerpc/mm/copro_fault.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/pgtable_32.c | 4 +- + arch/powerpc/mm/pgtable_64.c | 3 +- + arch/s390/configs/default_defconfig | 2 +- + arch/s390/configs/gcov_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + arch/s390/configs/zfcpdump_defconfig | 2 +- + arch/s390/include/asm/tlb.h | 22 +- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/pgalloc.c | 2 +- + arch/score/include/asm/pgalloc.h | 5 +- + arch/score/mm/fault.c | 2 +- + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 2 +- + arch/sh/configs/se7722_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/urquell_defconfig | 2 +- + arch/sh/include/asm/pgalloc.h | 4 +- + arch/sh/include/asm/tlb.h | 20 +- + arch/sh/mm/fault.c | 2 +- + arch/sh/mm/pgtable.c | 2 +- + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/sparc/include/asm/pgalloc_64.h | 6 +- + arch/sparc/mm/fault_32.c | 4 +- + arch/sparc/mm/fault_64.c | 2 +- + arch/sparc/mm/init_64.c | 6 +- + arch/tile/mm/fault.c | 2 +- + arch/tile/mm/pgtable.c | 2 +- + arch/um/include/asm/tlb.h | 20 +- + arch/um/kernel/mem.c | 4 +- + arch/um/kernel/trap.c | 2 +- + arch/unicore32/include/asm/pgalloc.h | 2 +- + arch/unicore32/mm/fault.c | 2 +- + arch/x86/configs/i386_defconfig | 2 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/include/asm/pgalloc.h | 12 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/pgtable.c | 10 +- + arch/x86/platform/efi/efi_64.c | 2 +- + arch/x86/xen/p2m.c | 2 +- + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 2 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 2 +- + arch/xtensa/include/asm/pgalloc.h | 2 +- + arch/xtensa/mm/fault.c | 2 +- + block/genhd.c | 2 +- + drivers/base/firmware_class.c | 183 +- + drivers/base/memory.c | 28 +- + drivers/base/node.c | 13 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/zram/Kconfig | 15 +- + drivers/block/zram/Makefile | 4 +- + drivers/block/zram/zcomp.c | 150 +- + drivers/block/zram/zcomp.h | 36 +- + drivers/block/zram/zcomp_lz4.c | 56 - + drivers/block/zram/zcomp_lz4.h | 17 - + drivers/block/zram/zcomp_lzo.c | 56 - + drivers/block/zram/zcomp_lzo.h | 17 - + drivers/block/zram/zram_drv.c | 48 +- + drivers/block/zram/zram_drv.h | 5 +- + drivers/char/mem.c | 24 + + drivers/iommu/amd_iommu_v2.c | 3 +- + drivers/iommu/intel-svm.c | 2 +- + drivers/memstick/core/ms_block.c | 17 +- + drivers/nvme/host/core.c | 16 +- + drivers/tty/sysrq.c | 1 + + drivers/virtio/virtio_balloon.c | 54 +- + drivers/w1/slaves/w1_ds2406.c | 14 +- + drivers/w1/slaves/w1_ds2408.c | 14 +- + drivers/w1/slaves/w1_ds2413.c | 14 +- + drivers/w1/slaves/w1_ds2423.c | 14 +- + drivers/w1/slaves/w1_ds2431.c | 14 +- + drivers/w1/slaves/w1_ds2433.c | 14 +- + drivers/w1/slaves/w1_ds2760.c | 43 +- + drivers/w1/slaves/w1_ds2780.c | 39 +- + drivers/w1/slaves/w1_ds2781.c | 40 +- + drivers/w1/slaves/w1_ds28e04.c | 14 +- + drivers/w1/w1_family.h | 12 + + drivers/xen/xen-selfballoon.c | 4 +- + fs/befs/linuxvfs.c | 31 +- + fs/btrfs/extent_io.c | 3 +- + fs/cifs/file.c | 2 +- + fs/exec.c | 9 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/readpage.c | 2 +- + fs/f2fs/data.c | 3 +- + fs/jbd2/journal.c | 32 +- + fs/mpage.c | 2 +- + fs/nilfs2/alloc.c | 45 +- + fs/nilfs2/bmap.c | 4 +- + fs/nilfs2/btree.c | 61 +- + fs/nilfs2/cpfile.c | 22 +- + fs/nilfs2/dat.c | 19 +- + fs/nilfs2/dir.c | 38 +- + fs/nilfs2/direct.c | 10 +- + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 7 +- + fs/nilfs2/inode.c | 32 +- + fs/nilfs2/ioctl.c | 47 +- + fs/nilfs2/mdt.c | 6 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 27 +- + fs/nilfs2/page.c | 19 +- + fs/nilfs2/recovery.c | 72 +- + fs/nilfs2/segbuf.c | 6 +- + fs/nilfs2/segment.c | 47 +- + fs/nilfs2/sufile.c | 31 +- + fs/nilfs2/super.c | 206 +- + fs/nilfs2/sysfs.c | 30 +- + fs/nilfs2/the_nilfs.c | 134 +- + fs/nilfs2/the_nilfs.h | 4 +- + fs/ocfs2/stack_user.c | 11 +- + fs/ocfs2/stackglue.c | 2 - + fs/orangefs/inode.c | 2 +- + fs/pipe.c | 32 +- + fs/proc/base.c | 7 +- + fs/proc/meminfo.c | 7 +- + fs/proc/task_mmu.c | 10 +- + fs/reiserfs/ibalance.c | 3 +- + fs/userfaultfd.c | 22 +- + include/asm-generic/tlb.h | 59 +- + include/linux/balloon_compaction.h | 53 +- + include/linux/bitmap.h | 7 +- + include/linux/compaction.h | 17 + + include/linux/cpumask.h | 2 +- + include/linux/crc64_ecma.h | 56 + + include/linux/dma-attrs.h | 3 +- + include/linux/dynamic_debug.h | 60 +- + include/linux/firmware.h | 8 + + include/linux/frontswap.h | 34 +- + include/linux/fs.h | 3 + + include/linux/gfp.h | 10 +- + include/linux/huge_mm.h | 36 +- + include/linux/jump_label.h | 50 +- + include/linux/kexec.h | 46 +- + include/linux/khugepaged.h | 5 + + include/linux/ksm.h | 3 +- + include/linux/memblock.h | 20 +- + include/linux/memcontrol.h | 103 +- + include/linux/memory_hotplug.h | 2 + + include/linux/migrate.h | 2 + + include/linux/mm.h | 53 +- + include/linux/mm_types.h | 73 +- + include/linux/mmdebug.h | 2 + + include/linux/mmzone.h | 8 +- + include/linux/oom.h | 10 +- + include/linux/page-flags.h | 128 +- + include/linux/page_ext.h | 4 +- + include/linux/page_owner.h | 12 +- + include/linux/pagemap.h | 6 +- + include/linux/radix-tree.h | 1 + + include/linux/rmap.h | 2 +- + include/linux/sem.h | 1 + + include/linux/shmem_fs.h | 45 +- + include/linux/slab.h | 9 + + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 9 + + include/linux/timekeeping.h | 1 + + include/linux/userfaultfd_k.h | 8 +- + include/linux/vm_event_item.h | 7 + + include/linux/vmstat.h | 6 + + include/trace/events/huge_memory.h | 39 +- + include/trace/events/zsmalloc.h | 56 + + include/uapi/linux/magic.h | 2 + + init/Kconfig | 4 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + ipc/shm.c | 10 +- + kernel/fork.c | 6 +- + kernel/futex.c | 2 + + kernel/jump_label.c | 48 + + kernel/kexec.c | 3 +- + kernel/kexec_core.c | 46 +- + kernel/ksysfs.c | 4 +- + kernel/printk/printk.c | 76 +- + kernel/time/timekeeping.c | 13 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 20 +- + lib/Kconfig.kasan | 4 +- + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 ++++ + lib/dynamic_debug.c | 7 + + lib/iommu-helper.c | 3 +- + lib/radix-tree.c | 84 +- + mm/Kconfig | 8 + + mm/Makefile | 2 +- + mm/balloon_compaction.c | 94 +- + mm/compaction.c | 118 +- + mm/filemap.c | 217 ++- + mm/frontswap.c | 35 +- + mm/gup.c | 9 +- + mm/huge_memory.c | 1999 ++++---------------- + mm/hugetlb.c | 54 +- + mm/internal.h | 4 + + mm/kasan/Makefile | 3 +- + mm/kasan/kasan.c | 85 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/quarantine.c | 5 + + mm/kasan/report.c | 8 +- + mm/khugepaged.c | 1921 +++++++++++++++++++ + mm/ksm.c | 9 +- + mm/memblock.c | 3 + + mm/memcontrol.c | 130 +- + mm/memory.c | 906 +++++---- + mm/memory_hotplug.c | 70 +- + mm/mempolicy.c | 4 +- + mm/migrate.c | 262 ++- + mm/mmap.c | 26 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 3 +- + mm/nommu.c | 3 +- + mm/oom_kill.c | 70 +- + mm/page-writeback.c | 1 + + mm/page_alloc.c | 163 +- + mm/page_isolation.c | 7 +- + mm/page_owner.c | 159 +- + mm/readahead.c | 13 +- + mm/rmap.c | 78 +- + mm/shmem.c | 920 ++++++++- + mm/slab.c | 80 +- + mm/slab.h | 40 +- + mm/slab_common.c | 49 +- + mm/slub.c | 197 +- + mm/swap.c | 2 + + mm/swapfile.c | 2 +- + mm/truncate.c | 28 +- + mm/util.c | 12 +- + mm/vmalloc.c | 6 +- + mm/vmscan.c | 8 +- + mm/vmstat.c | 20 +- + mm/zsmalloc.c | 1364 +++++++++---- + net/unix/af_unix.c | 1 + + samples/kprobes/jprobe_example.c | 6 +- + samples/kprobes/kprobe_example.c | 29 +- + samples/kprobes/kretprobe_example.c | 14 +- + scripts/Makefile.lib | 2 +- + scripts/tags.sh | 3 + + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + tools/testing/selftests/vm/compaction_test.c | 2 +- + tools/vm/page_owner_sort.c | 9 +- + 370 files changed, 9105 insertions(+), 5106 deletions(-) + delete mode 100644 drivers/block/zram/zcomp_lz4.c + delete mode 100644 drivers/block/zram/zcomp_lz4.h + delete mode 100644 drivers/block/zram/zcomp_lzo.c + delete mode 100644 drivers/block/zram/zcomp_lzo.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/zsmalloc.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 mm/khugepaged.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: drivers/fpga/Kconfig: fix build failure +Applying: tree-wide: replace config_enabled() with IS_ENABLED() +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1b47600a2bb6...8a5177ba836f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8a5177ba836f tree-wide: replace config_enabled() with IS_ENABLED()) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/mips/include/asm/mips-cm.h | 2 +- + arch/mips/include/asm/pgtable.h | 16 +++++------ + arch/mips/include/asm/seccomp.h | 4 +-- + arch/mips/include/asm/signal.h | 4 +-- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/uaccess.h | 2 +- + arch/mips/jz4740/setup.c | 2 +- + arch/mips/kernel/cpu-bugs64.c | 6 ++--- + arch/mips/kernel/elf.c | 4 +-- + arch/mips/kernel/mips-cm.c | 2 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 34 ++++++++++++------------ + arch/mips/kernel/pm-cps.c | 4 +-- + arch/mips/kernel/signal.c | 10 +++---- + arch/mips/kernel/smp-cps.c | 4 +-- + arch/mips/kernel/unaligned.c | 10 +++---- + arch/mips/math-emu/cp1emu.c | 6 ++--- + arch/mips/mm/tlbex.c | 10 +++---- + arch/mips/mti-malta/malta-dtshim.c | 4 +-- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/mti-malta/malta-setup.c | 2 +- + arch/mips/net/bpf_jit.c | 4 +-- + arch/x86/include/asm/elf.h | 4 +-- + arch/x86/include/asm/fpu/internal.h | 16 +++++------ + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/fpu/signal.c | 12 ++++----- + arch/x86/kernel/signal.c | 14 +++++----- + drivers/firmware/broadcom/bcm47xx_sprom.c | 2 +- + drivers/fpga/Kconfig | 1 + + drivers/irqchip/irq-mips-gic.c | 2 +- + drivers/mtd/bcm47xxpart.c | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 12 ++++----- + drivers/net/wireless/ath/ath10k/mac.c | 10 +++---- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 +- + drivers/net/wireless/ath/ath9k/common-spectral.c | 6 ++--- + drivers/net/wireless/ath/ath9k/init.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 12 ++++----- + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/regd.c | 4 +-- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + drivers/pci/ecam.c | 2 +- + drivers/tty/serial/ar933x_uart.c | 4 +-- + include/linux/fence.h | 2 +- + include/linux/ww_mutex.h | 4 +-- + kernel/ptrace.c | 4 +-- + kernel/seccomp.c | 6 ++--- + net/wireless/chan.c | 2 +- + 50 files changed, 137 insertions(+), 137 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..a0422af037bb --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.6 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5f8ee71c7f3f --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160614 |