diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-20 15:20:52 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-20 15:20:52 +1000 |
| commit | 708e764f2083fde82ce2b4fefa774ac908ed665d (patch) | |
| tree | db45e541aa77681bd768441b0287ad4e6792e696 | |
| parent | 2ee52b3ca5e07e66eecfeeb1cb311633f2dad815 (diff) | |
Add linux-next specific files for 20150720next-20150720
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 226 | ||||
| -rw-r--r-- | Next/Trees | 228 | ||||
| -rw-r--r-- | Next/merge.log | 4731 | ||||
| -rw-r--r-- | Next/quilt-import.log | 13 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5199 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e06913e0ef90 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,226 @@ +Name SHA1 +---- ---- +origin 52721d9d3334c1cb1f76219a161084094ec634dc +fixes c7e9ad7da219cf3f8a7cc45eb1c02fdd91199e8d +kbuild-current c517d838eb7d07bbe9507871fab3931deccff539 +arc-current e4140819dadc3624accac8294881bca8a3cba4ed +arm-current 0871b7248113ebfccbfabcd3fd1f867a2bc681f4 +m68k-current 1214c525484cabb27ed37df936c3451682757263 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes bc0195aad0daa2ad5b0d76cce22b167bc3435590 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +powerpc-merge-benh c517d838eb7d07bbe9507871fab3931deccff539 +sparc 4a10a91756ef381bced7b88cfb9232f660b92d93 +net e2370f07cf703c0920c99bc24de3d152262738f0 +ipsec 31a418986a5852034d520a5bab546821ff1ccf3d +sound-current 25e5eaf19962bd48788371e4f516bdd89ce248bc +pci-current c9ddbac9c89110f77cb0fa07e634aaf1194899aa +wireless-drivers df2cd4586f177acf9493dee079fc7d18268c5f54 +driver-core.current bc0195aad0daa2ad5b0d76cce22b167bc3435590 +tty.current bc0195aad0daa2ad5b0d76cce22b167bc3435590 +usb.current 51f007e1a1f11d5aaa189c1a5cfbae0e8793fe50 +usb-gadget-fixes b2e2c94b878be2500d4d42c1f52a2fa1fe7648b4 +usb-serial-fixes d23f47d4927fd2f61b3a754d83c7bcec215b5cfe +staging.current d309509f84725f99326cc73d3b00aae096b374ae +char-misc.current bc0195aad0daa2ad5b0d76cce22b167bc3435590 +input-current d98399e688f8c4f42f4270c2dfe1293f69247c5b +crypto-current 030f4e968741d65aea9cd5f7814d1164967801ef +ide d681f1166919d6829083c069a83edcd59bfd5e34 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 758556bdc1c8a8dffea0ea9f9df891878cc2468c +vfio-fixes db7d4d7f40215843000cb9d441c9149fd42ea36b +kselftest-fixes d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +drm-intel-fixes e9308884878942c618a42cab122df80fbf458dc9 +asm-generic 643165c8bbc8617d8222cb50c89e34fe64d226cf +arc 624b71ee20acba269e348eb6bdd516d47b9d30fa +arm 38ccf8658ceee07a5f4e672f03f87f4d0d683991 +arm-perf d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +arm-soc c3066d6c2b5f891d2500668eae2f1f2c9e512fdb +at91 dd1f58f398fbd89dd13cbfac36521240b049ab64 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +rpi 50b674b89355c9d400f9fc00451451412e4944fb +berlin d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +cortex-m e799b6f37e6ccd7b97e3e2df62a30f1c5b211290 +imx-mxs 5228adb0e270cf399883018abd246fb1f69081f3 +keystone a6ba4234e474f1caebec211c949846ac2956a332 +mvebu b66ba2c1292d4631379c94045e0557b90526092c +omap f720de8fce5fddfaf6fbb7a9b20baa469d4f9d7c +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +renesas f1fc7fadfaf5bf691b908d7e748735a8e2da2b1d +samsung bcddc3a84e49ca1c646cf2081687a544a15f9218 +samsung-krzk 614a3a4aedc7247024a86fb3af94c192c9331027 +sunxi 2676ca3b29937cb5b2ea0687feedb2cc19590aa4 +tegra 7124274285a42917059a7543a6629b9ea2fa487e +arm64 f871d26807078cf4cc0a64a97ee2c6bb513a4397 +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x 960a2741d5fd48e4b2a2151c3dc5ac268a5ea87a +cris 1e4d6e13d050b0e8d68e59514fef5bf78529d911 +h8300 52b2512d507d0bb615d59ec0d837584ed7cc90d5 +hexagon 8914d7e857807e1e60975000cba3750c9b2643e8 +ia64 ae40b7e2875228d961c2202d69b55d416644e830 +m68k 1214c525484cabb27ed37df936c3451682757263 +m68knommu 67592f699cb309559575b89d727d510ea076521c +metag 7ce0c22b07871402f9fb8939e09fb4c10811438a +microblaze c4fa9a6ae285ec4777d0524a4ee9c9039a5a4c28 +mips fed13add7d32bbb0818451efd52f7f522fa8ed4f +nios2 a8955cc3a504e43ecd606e9f0d9bc25de240aacb +parisc-hd 9d37e6679dfddbb5fa605fb2d7ff448f7cd6d038 +powerpc bd664f892e3e2b01c79197cad3111d54b7aedf39 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +powerpc-benh 65e7bb2a34fe7b5fc3ae4532308150c600188118 +fsl f1b3b4450dcbfd0098b6fc3b00f4880701550c83 +mpc5xxx 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +s390 20a8f53065e2f8c4f9ca39f6a5285d8423bd6001 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +uml 46acfb8068137d91928f7e32580edf96a348eaa8 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa 1203b34261e4f223a3b86627b4567f6afca8f9aa +btrfs 5a5003df98d5a7f6834227885b7c9728f767cc27 +ceph 64c1797a9371c24d71462f6438ea1e378bd53462 +cifs 6468ffb3e9da5cda1139115aab9ee67a32528f64 +ecryptfs 6d65261a09adaa374c05de807f73a144d783669e +ext3 70f19f5869c5accfd9f371c099f21c71516591b2 +ext4 7444a072c387a93ebee7066e8aee776954ab0e41 +f2fs f99fc27c73461253b0f8fcce8d2f868088338a43 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0a30f612d6cfd936235b41b090dbe0119c9039d1 +gfs2 ea79f0ec7a38b8fe6653e87c36a7852821c2c716 +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs faa4a54f0be15b5d81b574fb5a40db24345d1a6c +nfsd 8c7fe4141707c290d940efa410ee3f23a5b0d9d3 +overlayfs cdb672795876d7bc1870aed9a2d7cb59f43d1d96 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 3d99e3fe13d473ac4578c37f477a59b829530764 +ubifs 669d3d123395ce00c7a1c4e3ca0254b2f9ec95d0 +xfs bc0195aad0daa2ad5b0d76cce22b167bc3435590 +file-locks ee296d7c5709440f8abd36b5b65c6b3e388538d9 +vfs 0f1db7dee200127da4c07928189748918c312031 +pci bc0195aad0daa2ad5b0d76cce22b167bc3435590 +hid 9f6355c7b6e811dc644e4fbd95086b9c5af03af8 +i2c 19e0ff4233826c0f6a4688dc3e966f10934fc9fd +jdelvare-hwmon 902fd32b771142a69a37cec7b09eda334181ef8e +dmi 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 +hwmon-staging 1840cf8ac8dc9379f894817b7f6d489f454023dc +v4l-dvb 5bab86243d949cf021b0f104faafc18f5d20283c +kbuild 31d61069530b5ff9185bc78653a7c701f9ac310b +kconfig b953c0d234bc72e8489d3bf51a276c5c4ec85345 +libata e695342e5aea830009aef89801a9a541d2f146b7 +pm 03b60e04284e6fe9515bb6ef8c347e3d0a437932 +idle a576d08d4eb2c2ca1320e0c9af41ea6383918848 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 +thermal-soc b89384e9e8c046a8a7221f38e02c3f8d6b445099 +ieee1394 d71e6a11737f4b3d857425a1d6f893231cbd1296 +dlm 2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 +swiotlb 023600f192be3f5776336e2c61d577b551a1ca9c +slave-dma 37d7079a34253c824bbd685fc2eb3824c672b961 +net-next c15df306fc79c672573f1cc2ebdfcb32d7e68780 +ipsec-next 493be55ac3d81f9c32832237288eb397a9993d5d +wireless-drivers-next 8fc2b61a36fe17f744b445a26599a6cac9e6c1c0 +bluetooth 95ee1d5db8d380ca33e5bf4089f92dd932416d19 +rdma 029191d8796d24641057628dcbb600ee82c69dd4 +mtd 5f867db63473f32cce1b868e281ebd42a41f8fad +l2-mtd 906b1f536d5b1a26e549c78a07b664f22340b7df +crypto b1ccc8f4b63109f9e56fadf72274714dfb000123 +drm c5fd936e992dd2829167d2adc63e151675ca6898 +drm-panel 4946b0430c6933383d33adf101529b7085a4a682 +drm-intel 4b0c8bb016e7f36e2d6ec230f9177f88def690d5 +drm-tegra 8a8005e3e19915559b542bf85cc1b17024ee1d31 +drm-misc f9fe4b9b2ad4f2b801fdff3d634b07c9f9fc4327 +drm-exynos 8b1d758b47cdc3ed6f7721086642404287bea3e4 +drm-msm 1a370be9ac51129e40b0ed7fa71d2b2b92bc47e5 +sound fbce23a0b95763dfc4961ce6240e055c39f497ed +sound-asoc c2cfef1c7daf7950f2f9eb6d2b97729116cc697c +modules 20bdc2cfdbc484777b30b96fcdbb8994038f3ce1 +input 800e3b9a68011c4124f380d50e2117523c41a843 +block d45a0f150e9d6689a71e8730699c45f41372e8fc +device-mapper 665022d72f9b5762f21b5ea02fa0503d04802849 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh bc0195aad0daa2ad5b0d76cce22b167bc3435590 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 195c018eefad2579f500256171c5ae1eb03a6f48 +mfd 46a0c045e80c9f1d77779a295b2c745a727f2d10 +backlight cca0ba2df3d4000bacd9b7807d46ffafac62d53a +battery b1a55af2773d5e4d30b748517fedfac26fc5fd81 +omap_dss2 f778dad38a54ca5207d024b5ebe0e6d71b8bad83 +regulator c205a8cd5b762e3ce98e0afabf86ee8bc3304e1e +security b3bddffd35a0b77eee89760eb94cafa18dc431f5 +integrity 24fd03c87695a76f0517df42a37e51b1597d2c8a +selinux fda4d578ed0a7e1d116f56a15efea0e4ba78acad +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog 1c4c7159ed2468f3ac4ce5a7f08d79663d381a93 +iommu 5e92946c39ca6abc65e34775a93cc1d1a819c0e3 +dwmw2-iommu c83b2f20fdde578bded3dfc4405c5db7a039c694 +vfio a714ea5fa41623c8d8c42bed0dfb38a4d653451d +osd 1fa3a002b2546c42c343c77c144871285896ced5 +jc_docs 0098f75bf729c6e4d77d9e8e8eeeb22553fded65 +trivial 79ce48df755e6a5231cc1ac515e7988e1d715ce1 +audit 0b08c5e59441d08ab4b5e72afefd5cd98a4d83df +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 +mailbox 7d641938aa2ae433a97cc65ec622547cfe08f2ed +spi 3f297519be4cdfd4c2e26dbf8ad46a67889bb50d +tip b5d1257ddefe75ccdc9b4940e223e7fa8f4c8a76 +clockevents 6fd817226ae6ed1c31ee1b6d9a2000a77248e187 +edac fa2ce64f85be48003e8c88efcb8c3d7e4d0939ff +edac-amd 99e1dfb7d2094d9afc1dca57d525f7b36aa18079 +irqchip a8bcdc32fafbeb236910e6ddc0161003a458ffc1 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace b44754d8262d3aab842998cf747f44fe6090be9f +rcu 80b4c788d8f2d0b78e516480fb7abc1c79859bc7 +kvm a88464a8b0ffb2f8dfb69d3ab982169578b50f22 +kvm-arm c62e631d4a8e41493c6341d8259e996ed5fc11e3 +kvm-ppc b79013b2449c23f1f505bdf39c5a6c330338b244 +kvms390 ea2cdd27dce66dc498c623adacd807ea3a350443 +xen-tip ffb7dbed47da6ac4460b606a3feee295bbe4d9e2 +percpu 83cb8557e8d2c8e5eddc64840c437299343a7960 +workqueues badb7f5e8bddf74a2f2dcc7d9d88accabfc000f5 +drivers-x86 d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +chrome-platform 96cba9b00e297303774bec59e192064d20adeb3d +regmap 28a33dcde4bfa5f85ec6019cb2f2f968f8a77b6c +hsi f451e76f896922137f8316cb071ae2cab78091ad +leds b67893206fc0a0e8af87130e67f3d8ae553fc87c +ipmi cc5c8d2cc01439cd35655e45442e47ab09966e69 +driver-core bc0195aad0daa2ad5b0d76cce22b167bc3435590 +tty bc0195aad0daa2ad5b0d76cce22b167bc3435590 +usb bc0195aad0daa2ad5b0d76cce22b167bc3435590 +usb-gadget d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +usb-serial d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +staging b8d1f261fe7e4967593a5637d62991b6197a03f8 +char-misc bc0195aad0daa2ad5b0d76cce22b167bc3435590 +extcon 00f7340196639499bbb0c84ad2d5007e6c1a9724 +kdbus 748cf9547ea30f5a4dfee5e97d1d2ff4b307c392 +cgroup 917d8e2d10f40e28aa9e0d824b2e5b8197d79fc2 +scsi 1278dd6809b11dc298e19d81ac0916275f7318c1 +target-updates f8d2b3fdf5fe1cfd69f26ddd1f048603f3d2bbf6 +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +pinctrl 70a7954868b9acdc3ec9232bd8275c1dbc0113a1 +vhost cdf764d59bc6c21a26e6f3388143f4889e35029d +remoteproc 8de3dbd0895bebe52d069a82feae8e3fb51c1bdf +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio da1c60cf916146f5b57ceadcd23165b790ec6f59 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 361c1066c939a88e3bb59364f47055b2a5fb3fd4 +dma-buf bc0195aad0daa2ad5b0d76cce22b167bc3435590 +userns 75509fd88fbd580c793780b0001c71c3510f2726 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk e6c42abb2c944b90865fd9255009a39bf3ec06f6 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 5f785de588735306ec4d7c875caf9d28481c8b21 +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +y2038 ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +access_once bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 +livepatching 07d42d41dfc438dc21e24e60e3f1092ff4ab2d0e +coresight 32c00c927e05e5663147781c02df5d83d950c04a +rtc a876e499eca872af69dc10868940ac131521356b +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm f0f2c072cf530d5b8890be5051cc8b36b0c54cce +akpm-current 76fb8073bdaf484c6b8530648a2539c0cd2b8f8b +akpm 4a425eb2d969aa009cb86fc3198895ae0724d6c9 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c5690c9fcb60 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,228 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +powerpc-merge-benh git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +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 +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 +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +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 +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-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 +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://github.com/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.rocketboards.org/linux-socfpga-next.git#nios2-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 +powerpc-benh git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.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 +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.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 +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/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 +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 +kdbus git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#kdbus +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +access_once 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/djbw/nvdimm#libnvdimm-for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..5ca8d5b58f2c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4731 @@ +$ date +Monday 20 July 09:26:22 AEST 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3aa20508a6fe Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security +Merging origin/master (52721d9d3334 Linux 4.2-rc3) +$ git merge origin/master +Updating 3aa20508a6fe..52721d9d3334 +Fast-forward + .mailmap | 5 +- + Documentation/ABI/testing/sysfs-bus-iio | 6 +- + Documentation/DocBook/drm.tmpl | 2 +- + Documentation/arm/SPEAr/overview.txt | 2 +- + Documentation/device-mapper/cache.txt | 6 + + Documentation/device-mapper/thin-provisioning.txt | 9 +- + .../devicetree/bindings/drm/imx/fsl-imx-drm.txt | 26 +- + MAINTAINERS | 109 ++++---- + Makefile | 2 +- + arch/Kconfig | 4 + + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/mm-arch-hooks.h | 15 -- + arch/arc/include/asm/Kbuild | 1 + + arch/arc/include/asm/mm-arch-hooks.h | 15 -- + arch/arm/boot/dts/am335x-pepper.dts | 16 +- + arch/arm/boot/dts/cros-ec-keyboard.dtsi | 4 + + arch/arm/boot/dts/imx23.dtsi | 1 + + arch/arm/boot/dts/imx27.dtsi | 12 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 5 +- + arch/arm/boot/dts/k2e.dtsi | 3 +- + arch/arm/boot/dts/keystone.dtsi | 3 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 2 + + arch/arm/boot/dts/omap5.dtsi | 2 + + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 26 +- + arch/arm/boot/dts/spear1310-evb.dts | 2 +- + arch/arm/boot/dts/spear1310.dtsi | 2 +- + arch/arm/boot/dts/spear1340-evb.dts | 2 +- + arch/arm/boot/dts/spear1340.dtsi | 2 +- + arch/arm/boot/dts/spear13xx.dtsi | 2 +- + arch/arm/boot/dts/spear300-evb.dts | 2 +- + arch/arm/boot/dts/spear300.dtsi | 2 +- + arch/arm/boot/dts/spear310-evb.dts | 2 +- + arch/arm/boot/dts/spear310.dtsi | 2 +- + arch/arm/boot/dts/spear320-evb.dts | 2 +- + arch/arm/boot/dts/spear320.dtsi | 2 +- + arch/arm/boot/dts/spear3xx.dtsi | 2 +- + arch/arm/boot/dts/ste-ccu8540.dts | 7 + + arch/arm/boot/dts/ste-ccu9540.dts | 7 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +- + arch/arm/boot/dts/ste-href.dtsi | 2 +- + arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 7 + + arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 7 + + arch/arm/boot/dts/ste-hrefprev60.dtsi | 5 + + arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 7 + + arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 7 + + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 25 +- + arch/arm/boot/dts/ste-snowball.dts | 25 +- + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/memory.h | 2 +- + arch/arm/include/asm/mm-arch-hooks.h | 15 -- + arch/arm/kernel/perf_event.c | 3 +- + arch/arm/kernel/reboot.c | 2 +- + arch/arm/mach-imx/gpc.c | 27 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-pxa/capc7117.c | 3 + + arch/arm/mach-pxa/cm-x2xx.c | 3 + + arch/arm/mach-pxa/cm-x300.c | 2 + + arch/arm/mach-pxa/colibri-pxa270.c | 3 + + arch/arm/mach-pxa/em-x270.c | 2 + + arch/arm/mach-pxa/icontrol.c | 3 + + arch/arm/mach-pxa/trizeps4.c | 3 + + arch/arm/mach-pxa/vpac270.c | 3 + + arch/arm/mach-pxa/zeus.c | 2 + + arch/arm/mach-spear/generic.h | 2 +- + arch/arm/mach-spear/include/mach/irqs.h | 2 +- + arch/arm/mach-spear/include/mach/misc_regs.h | 2 +- + arch/arm/mach-spear/include/mach/spear.h | 2 +- + arch/arm/mach-spear/include/mach/uncompress.h | 2 +- + arch/arm/mach-spear/pl080.c | 2 +- + arch/arm/mach-spear/pl080.h | 2 +- + arch/arm/mach-spear/restart.c | 2 +- + arch/arm/mach-spear/spear1310.c | 2 +- + arch/arm/mach-spear/spear1340.c | 2 +- + arch/arm/mach-spear/spear13xx.c | 2 +- + arch/arm/mach-spear/spear300.c | 2 +- + arch/arm/mach-spear/spear310.c | 2 +- + arch/arm/mach-spear/spear320.c | 2 +- + arch/arm/mach-spear/spear3xx.c | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/proc-v7.S | 14 +- + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/mm-arch-hooks.h | 15 -- + arch/avr32/include/asm/Kbuild | 1 + + arch/avr32/include/asm/mm-arch-hooks.h | 15 -- + arch/blackfin/include/asm/Kbuild | 1 + + arch/blackfin/include/asm/mm-arch-hooks.h | 15 -- + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/mm-arch-hooks.h | 15 -- + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/mm-arch-hooks.h | 15 -- + arch/frv/include/asm/Kbuild | 1 + + arch/frv/include/asm/mm-arch-hooks.h | 15 -- + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/mm-arch-hooks.h | 15 -- + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/mm-arch-hooks.h | 15 -- + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/mm-arch-hooks.h | 15 -- + arch/m68k/Kconfig.cpu | 49 ++-- + arch/m68k/configs/m5208evb_defconfig | 22 +- + arch/m68k/configs/m5249evb_defconfig | 17 +- + arch/m68k/configs/m5272c3_defconfig | 14 +- + arch/m68k/configs/m5275evb_defconfig | 19 +- + arch/m68k/configs/m5307c3_defconfig | 21 +- + arch/m68k/configs/m5407c3_defconfig | 17 +- + arch/m68k/configs/m5475evb_defconfig | 9 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/coldfire.h | 2 +- + arch/m68k/include/asm/io_mm.h | 3 +- + arch/m68k/include/asm/mm-arch-hooks.h | 15 -- + arch/metag/include/asm/Kbuild | 1 + + arch/metag/include/asm/mm-arch-hooks.h | 15 -- + arch/microblaze/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/mm-arch-hooks.h | 15 -- + arch/mips/Kconfig | 6 +- + arch/mips/Makefile | 7 - + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/fpu.h | 2 +- + arch/mips/include/asm/mach-sibyte/war.h | 3 +- + arch/mips/include/asm/mm-arch-hooks.h | 15 -- + arch/mips/include/uapi/asm/sigcontext.h | 4 +- + arch/mips/kernel/asm-offsets.c | 2 +- + arch/mips/sibyte/Kconfig | 5 - + arch/mips/sibyte/common/bus_watcher.c | 5 +- + arch/mips/sibyte/sb1250/setup.c | 2 - + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/mm-arch-hooks.h | 15 -- + arch/nios2/include/asm/Kbuild | 1 + + arch/nios2/include/asm/mm-arch-hooks.h | 15 -- + arch/openrisc/Kconfig | 4 +- + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/mm-arch-hooks.h | 15 -- + arch/parisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/mm-arch-hooks.h | 15 -- + arch/parisc/include/asm/pgalloc.h | 3 +- + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/hugetlb.h | 1 + + arch/s390/include/asm/mm-arch-hooks.h | 15 -- + arch/s390/include/asm/page.h | 8 +- + arch/s390/kernel/setup.c | 2 - + arch/s390/mm/pgtable.c | 2 - + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/mm-arch-hooks.h | 15 -- + arch/sh/include/asm/Kbuild | 1 + + arch/sh/include/asm/mm-arch-hooks.h | 15 -- + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/mm-arch-hooks.h | 15 -- + arch/tile/include/asm/Kbuild | 1 + + arch/tile/include/asm/mm-arch-hooks.h | 15 -- + arch/um/include/asm/Kbuild | 1 + + arch/um/include/asm/mm-arch-hooks.h | 15 -- + arch/unicore32/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/mm-arch-hooks.h | 15 -- + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 12 + + arch/x86/entry/entry_64.S | 299 ++++++++++++++------- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/fpu/types.h | 72 ++--- + arch/x86/include/asm/intel_pmc_ipc.h | 27 -- + arch/x86/include/asm/mm-arch-hooks.h | 15 -- + arch/x86/include/asm/mmu_context.h | 2 +- + arch/x86/include/asm/processor.h | 10 +- + arch/x86/kernel/fpu/init.c | 40 +++ + arch/x86/kernel/nmi.c | 123 ++++----- + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/smpboot.c | 11 + + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/asm/mm-arch-hooks.h | 15 -- + block/bio-integrity.c | 4 +- + block/blk-cgroup.c | 140 ++++++---- + block/blk-core.c | 2 +- + block/blk-mq.c | 2 +- + drivers/acpi/resource.c | 24 +- + drivers/ata/pata_arasan_cf.c | 4 +- + drivers/block/nvme-core.c | 13 +- + drivers/clk/spear/clk-aux-synth.c | 2 +- + drivers/clk/spear/clk-frac-synth.c | 2 +- + drivers/clk/spear/clk-gpt-synth.c | 2 +- + drivers/clk/spear/clk-vco-pll.c | 2 +- + drivers/clk/spear/clk.c | 2 +- + drivers/clk/spear/clk.h | 2 +- + drivers/clk/spear/spear1310_clock.c | 2 +- + drivers/clk/spear/spear1340_clock.c | 2 +- + drivers/clk/spear/spear3xx_clock.c | 2 +- + drivers/clk/spear/spear6xx_clock.c | 2 +- + drivers/cpufreq/cpufreq.c | 10 + + drivers/cpufreq/freq_table.c | 9 - + drivers/cpuidle/cpuidle.c | 9 +- + drivers/dma/dw/core.c | 2 +- + drivers/gpio/gpio-brcmstb.c | 14 +- + drivers/gpio/gpio-davinci.c | 6 +- + drivers/gpio/gpio-max732x.c | 1 + + drivers/gpio/gpio-omap.c | 5 +- + drivers/gpio/gpio-pca953x.c | 4 + + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpio-zynq.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +- + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 35 ++- + drivers/gpu/drm/armada/armada_crtc.c | 2 - + drivers/gpu/drm/armada/armada_gem.c | 5 +- + drivers/gpu/drm/armada/armada_overlay.c | 121 +++++---- + drivers/gpu/drm/drm_crtc.c | 7 +- + drivers/gpu/drm/drm_ioc32.c | 60 +++++ + drivers/gpu/drm/i915/i915_drv.h | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 35 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 4 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 - + drivers/gpu/drm/i915/i915_gem_gtt.c | 9 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 1 - + drivers/gpu/drm/i915/i915_gem_tiling.c | 12 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 29 +- + drivers/gpu/drm/i915/i915_ioc32.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 13 +- + drivers/gpu/drm/i915/i915_trace.h | 2 +- + drivers/gpu/drm/i915/intel_display.c | 8 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 7 + + drivers/gpu/drm/imx/imx-tve.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 21 +- + drivers/gpu/drm/radeon/ci_dpm.c | 2 +- + drivers/gpu/drm/radeon/radeon_gart.c | 12 +- + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 1 - + drivers/gpu/drm/radeon/si_dpm.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 67 ++--- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 49 +++- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 13 +- + drivers/gpu/ipu-v3/ipu-common.c | 3 + + drivers/iio/accel/bmc150-accel.c | 2 +- + drivers/iio/adc/Kconfig | 3 +- + drivers/iio/adc/at91_adc.c | 8 +- + drivers/iio/adc/rockchip_saradc.c | 4 + + drivers/iio/adc/twl4030-madc.c | 3 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 11 +- + drivers/iio/dac/ad5624r_spi.c | 4 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 18 ++ + drivers/iio/light/Kconfig | 2 + + drivers/iio/light/cm3323.c | 2 +- + drivers/iio/light/ltr501.c | 2 +- + drivers/iio/light/stk3310.c | 53 ++-- + drivers/iio/light/tcs3414.c | 2 +- + drivers/iio/magnetometer/mmc35240.c | 35 ++- + drivers/iio/proximity/sx9500.c | 28 +- + drivers/iio/temperature/tmp006.c | 3 + + drivers/irqchip/irq-gic-v3-its.c | 111 +++++--- + drivers/irqchip/spear-shirq.c | 2 +- + drivers/md/bcache/closure.h | 3 - + drivers/md/bcache/io.c | 1 + + drivers/md/bcache/journal.c | 2 + + drivers/md/bcache/request.c | 14 +- + drivers/md/dm-cache-target.c | 38 +-- + drivers/md/dm-thin.c | 44 ++- + drivers/md/dm.c | 12 +- + drivers/md/persistent-data/dm-btree-remove.c | 6 +- + drivers/md/persistent-data/dm-btree.c | 2 +- + drivers/mfd/stmpe-i2c.c | 2 +- + drivers/mfd/stmpe-spi.c | 4 +- + drivers/mmc/host/sdhci-spear.c | 4 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 9 - + drivers/pinctrl/spear/pinctrl-spear.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear.h | 2 +- + drivers/pinctrl/spear/pinctrl-spear1310.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear1340.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear300.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear310.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear320.c | 4 +- + drivers/pinctrl/spear/pinctrl-spear3xx.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear3xx.h | 2 +- + drivers/platform/x86/dell-laptop.c | 171 ++++++++---- + drivers/platform/x86/intel_pmc_ipc.c | 83 +++--- + drivers/platform/x86/intel_scu_ipc.c | 6 +- + drivers/rtc/rtc-armada38x.c | 2 +- + drivers/rtc/rtc-mt6397.c | 4 +- + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/st.c | 2 +- + drivers/staging/board/Kconfig | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 1 - + drivers/staging/vt6655/device_main.c | 2 +- + drivers/staging/vt6656/main_usb.c | 2 +- + drivers/usb/dwc2/core.c | 55 ++-- + drivers/usb/dwc2/core.h | 9 +- + drivers/usb/dwc2/hcd.c | 55 +++- + drivers/usb/dwc2/hcd.h | 5 +- + drivers/usb/dwc2/hcd_queue.c | 49 +--- + drivers/usb/dwc3/core.c | 6 +- + drivers/usb/gadget/composite.c | 11 +- + drivers/usb/gadget/configfs.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 6 +- + drivers/usb/gadget/function/f_mass_storage.c | 16 +- + drivers/usb/gadget/function/f_midi.c | 4 +- + drivers/usb/gadget/udc/fotg210-udc.c | 3 +- + drivers/usb/musb/musb_virthub.c | 4 +- + drivers/usb/phy/phy-mxs-usb.c | 3 + + drivers/usb/serial/cp210x.c | 1 + + drivers/usb/serial/mos7720.c | 253 +++++++++-------- + drivers/usb/serial/option.c | 1 + + drivers/usb/serial/usb-serial.c | 1 + + drivers/watchdog/sp805_wdt.c | 4 +- + fs/btrfs/extent-tree.c | 13 + + fs/btrfs/inode.c | 5 +- + fs/btrfs/ioctl.c | 18 +- + fs/btrfs/transaction.c | 4 +- + fs/configfs/item.c | 4 +- + fs/jfs/file.c | 2 +- + fs/jfs/inode.c | 4 +- + fs/jfs/namei.c | 27 +- + fs/notify/mark.c | 34 +-- + fs/proc/Kconfig | 6 + + fs/proc/base.c | 5 + + fs/proc/kcore.c | 4 +- + include/asm-generic/mm-arch-hooks.h | 16 ++ + include/linux/amba/sp810.h | 2 +- + include/linux/blk-cgroup.h | 11 +- + include/linux/clkdev.h | 7 +- + include/linux/compat.h | 2 +- + include/linux/configfs.h | 3 +- + include/linux/cpu.h | 7 +- + include/linux/dcache.h | 3 +- + include/linux/device.h | 15 +- + include/linux/gpio/driver.h | 2 +- + include/linux/hid-sensor-hub.h | 1 + + include/linux/hugetlb.h | 17 +- + include/linux/iommu.h | 2 +- + include/linux/kernel.h | 9 +- + include/linux/kobject.h | 5 +- + include/linux/mmiotrace.h | 2 +- + include/linux/page_owner.h | 13 + + include/linux/pata_arasan_cf_data.h | 2 +- + include/linux/printk.h | 6 +- + include/linux/sched.h | 16 +- + kernel/cpu.c | 9 - + kernel/fork.c | 7 +- + kernel/irq/resend.c | 18 +- + kernel/sched/fair.c | 2 +- + kernel/time/tick-broadcast.c | 1 - + kernel/time/tick-common.c | 1 + + lib/decompress.c | 5 +- + lib/dma-debug.c | 3 + + lib/hexdump.c | 7 +- + lib/kobject.c | 5 +- + mm/cma_debug.c | 11 +- + mm/page_alloc.c | 14 +- + mm/page_owner.c | 7 + + scripts/checkpatch.pl | 2 +- + sound/pci/hda/hda_generic.c | 2 +- + sound/pci/hda/patch_hdmi.c | 2 + + sound/pci/hda/patch_realtek.c | 55 ++++ + sound/usb/line6/pcm.c | 9 +- + sound/usb/quirks-table.h | 68 +++++ + tools/lib/api/Makefile | 2 +- + tools/lib/hweight.c | 62 +++++ + tools/lib/traceevent/Makefile | 2 +- + tools/perf/MANIFEST | 2 +- + tools/perf/Makefile.perf | 19 +- + tools/perf/builtin-stat.c | 4 +- + tools/perf/ui/browsers/hists.c | 2 +- + tools/perf/util/Build | 2 +- + tools/perf/util/auxtrace.c | 10 +- + tools/perf/util/python-ext-sources | 4 +- + tools/perf/util/symbol.c | 2 + + tools/perf/util/symbol.h | 3 +- + tools/perf/util/thread_map.c | 3 +- + tools/perf/util/vdso.c | 8 +- + 371 files changed, 2510 insertions(+), 1976 deletions(-) + delete mode 100644 arch/alpha/include/asm/mm-arch-hooks.h + delete mode 100644 arch/arc/include/asm/mm-arch-hooks.h + delete mode 100644 arch/arm/include/asm/mm-arch-hooks.h + delete mode 100644 arch/arm64/include/asm/mm-arch-hooks.h + delete mode 100644 arch/avr32/include/asm/mm-arch-hooks.h + delete mode 100644 arch/blackfin/include/asm/mm-arch-hooks.h + delete mode 100644 arch/c6x/include/asm/mm-arch-hooks.h + delete mode 100644 arch/cris/include/asm/mm-arch-hooks.h + delete mode 100644 arch/frv/include/asm/mm-arch-hooks.h + delete mode 100644 arch/hexagon/include/asm/mm-arch-hooks.h + delete mode 100644 arch/ia64/include/asm/mm-arch-hooks.h + delete mode 100644 arch/m32r/include/asm/mm-arch-hooks.h + delete mode 100644 arch/m68k/include/asm/mm-arch-hooks.h + delete mode 100644 arch/metag/include/asm/mm-arch-hooks.h + delete mode 100644 arch/microblaze/include/asm/mm-arch-hooks.h + delete mode 100644 arch/mips/include/asm/mm-arch-hooks.h + delete mode 100644 arch/mn10300/include/asm/mm-arch-hooks.h + delete mode 100644 arch/nios2/include/asm/mm-arch-hooks.h + delete mode 100644 arch/openrisc/include/asm/mm-arch-hooks.h + delete mode 100644 arch/parisc/include/asm/mm-arch-hooks.h + delete mode 100644 arch/s390/include/asm/mm-arch-hooks.h + delete mode 100644 arch/score/include/asm/mm-arch-hooks.h + delete mode 100644 arch/sh/include/asm/mm-arch-hooks.h + delete mode 100644 arch/sparc/include/asm/mm-arch-hooks.h + delete mode 100644 arch/tile/include/asm/mm-arch-hooks.h + delete mode 100644 arch/um/include/asm/mm-arch-hooks.h + delete mode 100644 arch/unicore32/include/asm/mm-arch-hooks.h + delete mode 100644 arch/x86/include/asm/mm-arch-hooks.h + delete mode 100644 arch/xtensa/include/asm/mm-arch-hooks.h + create mode 100644 include/asm-generic/mm-arch-hooks.h + create mode 100644 tools/lib/hweight.c +Merging fixes/master (c7e9ad7da219 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (0871b7248113 ARM: fix __virt_to_idmap build error on !MMU) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (1214c525484c m68k: Use for_each_sg()) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (bc0195aad0da Linux 4.2-rc2) +$ 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 powerpc-merge-benh/merge (c517d838eb7d Linux 4.0-rc1) +$ git merge powerpc-merge-benh/merge +Already up-to-date. +Merging sparc/master (4a10a91756ef Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit) +$ git merge sparc/master +Already up-to-date. +Merging net/master (e2370f07cf70 ravb: do not invalidate cache for RX buffer twice) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btbcm.c | 11 ++-- + drivers/isdn/gigaset/ser-gigaset.c | 35 ++++-------- + drivers/net/can/at91_can.c | 8 +-- + drivers/net/can/bfin_can.c | 6 +- + drivers/net/can/cc770/cc770.c | 4 +- + drivers/net/can/flexcan.c | 7 +-- + drivers/net/can/grcan.c | 3 +- + drivers/net/can/sja1000/sja1000.c | 6 +- + drivers/net/can/slcan.c | 2 +- + drivers/net/can/ti_hecc.c | 2 +- + drivers/net/can/usb/ems_usb.c | 6 +- + drivers/net/can/usb/esd_usb2.c | 6 +- + drivers/net/can/usb/peak_usb/pcan_usb.c | 7 +-- + drivers/net/can/usb/peak_usb/pcan_usb_pro.c | 4 +- + drivers/net/can/usb/usb_8dev.c | 6 +- + drivers/net/ethernet/freescale/fec_main.c | 88 +++++------------------------ + drivers/net/ethernet/renesas/ravb_main.c | 10 +--- + drivers/net/ipvlan/ipvlan.h | 9 ++- + drivers/net/ipvlan/ipvlan_core.c | 6 +- + drivers/net/ipvlan/ipvlan_main.c | 42 +++++++------- + drivers/net/xen-netback/netback.c | 6 +- + include/net/ip.h | 1 + + net/ax25/ax25_subr.c | 1 + + net/bridge/br_mdb.c | 1 - + net/bridge/br_multicast.c | 37 +++++++++--- + net/core/datagram.c | 56 +++++++++++++++--- + net/core/rtnetlink.c | 11 ++-- + net/ipv4/datagram.c | 16 ++++-- + net/ipv4/tcp_input.c | 3 +- + net/ipv6/datagram.c | 20 +++++-- + net/sched/act_bpf.c | 3 + + net/sched/sch_fq_codel.c | 13 ++++- + net/sched/sch_sfq.c | 2 +- + 33 files changed, 218 insertions(+), 220 deletions(-) +Merging ipsec/master (31a418986a58 xen: netback: read hotplug script once at start of day.) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (25e5eaf19962 ALSA: sparc: Add missing kfree in error path) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/core/pcm_native.c | 2 +- + sound/sparc/amd7930.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (c9ddbac9c891 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + include/uapi/linux/pci_regs.h | 1 + + 1 file changed, 1 insertion(+) +Merging wireless-drivers/master (df2cd4586f17 Merge tag 'iwlwifi-for-kalle-2015-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/iwlwifi/iwl-fh.h | 6 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 12 +- + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 3 +- + drivers/net/wireless/iwlwifi/mvm/scan.c | 3 + + drivers/net/wireless/iwlwifi/mvm/sta.c | 3 +- + drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 2 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 5 +- + drivers/net/wireless/iwlwifi/pcie/internal.h | 51 +-- + drivers/net/wireless/iwlwifi/pcie/rx.c | 414 +++++-------------------- + drivers/net/wireless/iwlwifi/pcie/trans.c | 52 ++-- + 12 files changed, 144 insertions(+), 410 deletions(-) +Merging driver-core.current/driver-core-linus (bc0195aad0da Linux 4.2-rc2) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (bc0195aad0da Linux 4.2-rc2) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (51f007e1a1f1 Merge tag 'usb-serial-4.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (b2e2c94b878b usb: gadget: f_midi: fix error recovery path) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (d23f47d4927f USB: serial: Destroy serial_minors IDR on module exit) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (d309509f8472 staging: vt6656: check ieee80211_bss_conf bssid not NULL) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (bc0195aad0da Linux 4.2-rc2) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (d98399e688f8 Input: elantech - force resolution of 31 u/mm) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/mouse/elantech.c | 13 ++++++++----- + drivers/input/touchscreen/zforce_ts.c | 2 +- + 2 files changed, 9 insertions(+), 6 deletions(-) +Merging crypto-current/master (030f4e968741 crypto: nx - Fix reentrancy bugs) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (d681f1166919 ide: remove deprecated use of pci api) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (758556bdc1c8 module: Fix load_module() error path) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (d770e558e219 Linux 4.2-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (e93088848789 drm/ttm: improve uncached page deallocation.) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (624b71ee20ac ARCv2: support HS38 releases) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (38ccf8658cee Merge branches 'fixes', 'misc' and 'omap-barrier' into for-next) +$ git merge arm/for-next +Resolved 'arch/arm/include/asm/Kbuild' using previous resolution. +Removing arch/arm/mach-omap2/include/mach/barriers.h +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging arch/arm/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1d0a5f882894] Merge remote-tracking branch 'arm/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/l2cc.txt | 6 ++ + arch/arm/common/mcpm_platsmp.c | 12 +-- + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/barrier.h | 13 ++- + arch/arm/include/asm/outercache.h | 17 ---- + arch/arm/include/asm/smp.h | 1 + + arch/arm/include/asm/smp_plat.h | 9 ++ + arch/arm/kernel/irq.c | 1 + + arch/arm/kernel/perf_event.c | 4 +- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/smp.c | 15 ++- + arch/arm/mach-mmp/pm-pxa910.c | 1 + + arch/arm/mach-omap2/Kconfig | 7 ++ + arch/arm/mach-omap2/common.c | 1 + + arch/arm/mach-omap2/common.h | 9 ++ + arch/arm/mach-omap2/include/mach/barriers.h | 33 ------- + arch/arm/mach-omap2/io.c | 2 + + arch/arm/mach-omap2/omap4-common.c | 121 +++++++++++++++++++++++++ + arch/arm/mach-omap2/sleep44xx.S | 8 +- + arch/arm/mach-prima2/pm.c | 1 + + arch/arm/mach-shmobile/common.h | 3 +- + arch/arm/mach-shmobile/platsmp.c | 4 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/mach-ux500/cache-l2x0.c | 1 + + arch/arm/mm/Kconfig | 4 + + arch/arm/mm/cache-l2x0.c | 5 + + arch/arm/mm/flush.c | 15 +++ + 29 files changed, 226 insertions(+), 76 deletions(-) + delete mode 100644 arch/arm/mach-omap2/include/mach/barriers.h +Merging arm-perf/for-next/perf (d770e558e219 Linux 4.2-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (c3066d6c2b5f Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Auto-merging arch/arm/mach-shmobile/smp-sh73a0.c +Auto-merging arch/arm/mach-shmobile/smp-r8a7790.c +Removing arch/arm/mach-shmobile/r8a7740.h +Removing arch/arm/mach-shmobile/pm-sh73a0.c +Removing arch/arm/mach-shmobile/pm-r8a7740.c +Removing arch/arm/mach-shmobile/intc-sh73a0.c +Removing arch/arm/mach-shmobile/include/mach/zboot_macros.h +Removing arch/arm/mach-shmobile/include/mach/zboot.h +Removing arch/arm/mach-shmobile/include/mach/head-kzm9g.txt +Removing arch/arm/mach-shmobile/dma-register.h +Removing arch/arm/mach-shmobile/clock-sh73a0.c +Removing arch/arm/mach-shmobile/clock-r8a7740.c +Removing arch/arm/mach-shmobile/board-kzm9g.c +Removing arch/arm/mach-shmobile/board-armadillo800eva.c +Removing arch/arm/mach-bcm/bcm63xx_headsmp.S +Removing arch/arm/configs/kzm9g_defconfig +Removing arch/arm/configs/armadillo800eva_defconfig +Auto-merging arch/arm/boot/dts/dra72-evm.dts +Removing arch/arm/boot/compressed/head-shmobile.S +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/marvell,kirkwood.txt | 2 + + Documentation/devicetree/bindings/arm/rockchip.txt | 20 + + .../bindings/clock/rockchip,rk3368-cru.txt | 61 + + .../bindings/memory-controllers/arm,pl172.txt | 125 ++ + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 2 - + arch/arm/Kconfig | 11 +- + arch/arm/arm-soc-for-next-contents.txt | 82 ++ + arch/arm/boot/compressed/Makefile | 4 - + arch/arm/boot/compressed/head-shmobile.S | 71 - + arch/arm/boot/dts/Makefile | 17 +- + arch/arm/boot/dts/am335x-boneblack.dts | 20 +- + arch/arm/boot/dts/am335x-evm.dts | 69 +- + arch/arm/boot/dts/am335x-evmsk.dts | 62 +- + arch/arm/boot/dts/am33xx.dtsi | 17 +- + arch/arm/boot/dts/am4372.dtsi | 9 + + arch/arm/boot/dts/am437x-gp-evm.dts | 108 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 45 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 130 +- + arch/arm/boot/dts/armada-375.dtsi | 4 + + arch/arm/boot/dts/armada-388-gp.dts | 12 +- + arch/arm/boot/dts/armada-38x.dtsi | 8 +- + arch/arm/boot/dts/armada-39x.dtsi | 8 +- + arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 89 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 14 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 4 + + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 4 + + arch/arm/boot/dts/cros-ec-sbs.dtsi | 52 + + arch/arm/boot/dts/cx92755.dtsi | 7 + + arch/arm/boot/dts/cx92755_equinox.dts | 3 +- + arch/arm/boot/dts/dm816x.dtsi | 2 +- + arch/arm/boot/dts/dra7.dtsi | 57 +- + arch/arm/boot/dts/dra72-evm.dts | 10 +- + arch/arm/boot/dts/kirkwood-lswvl.dts | 301 +++++ + arch/arm/boot/dts/kirkwood-lswxl.dts | 301 +++++ + arch/arm/boot/dts/lpc18xx.dtsi | 235 +++- + arch/arm/boot/dts/lpc4337-ciaa.dts | 187 +++ + arch/arm/boot/dts/lpc4350-hitex-eval.dts | 4 - + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 214 +++ + arch/arm/boot/dts/omap3-overo-base.dtsi | 55 + + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 3 +- + arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 53 + + arch/arm/boot/dts/omap3-overo-palo35.dts | 37 + + arch/arm/boot/dts/omap3-overo-storm-palo35.dts | 37 + + arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts | 21 + + arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi | 65 + + arch/arm/boot/dts/omap3-overo-tobiduo.dts | 21 + + arch/arm/boot/dts/omap3-overo.dtsi | 4 - + arch/arm/boot/dts/r8a73a4.dtsi | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 13 + + arch/arm/boot/dts/r8a7779.dtsi | 5 +- + arch/arm/boot/dts/r8a7790.dtsi | 22 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7793-gose.dts | 63 + + arch/arm/boot/dts/r8a7793.dtsi | 367 ++++++ + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 1 + + arch/arm/boot/dts/rk3066a-marsboard.dts | 1 + + arch/arm/boot/dts/rk3066a-rayeager.dts | 1 + + arch/arm/boot/dts/rk3188-radxarock.dts | 1 + + arch/arm/boot/dts/rk3288-evb.dtsi | 1 + + arch/arm/boot/dts/rk3288-firefly.dtsi | 3 + + arch/arm/boot/dts/rk3288-popmetal.dts | 1 + + arch/arm/boot/dts/rk3288-r89.dts | 413 ++++++ + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 232 ++++ + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 197 +++ + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 128 ++ + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 122 ++ + arch/arm/boot/dts/rk3288-veyron.dtsi | 563 ++++++++ + arch/arm/boot/dts/rk3288.dtsi | 11 +- + arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 29 +- + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 63 + + arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 29 +- + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 56 + + arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 36 +- + arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 61 + + arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 33 +- + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 63 + + arch/arm/configs/armadillo800eva_defconfig | 162 --- + arch/arm/configs/ep93xx_defconfig | 29 +- + arch/arm/configs/kzm9g_defconfig | 154 --- + arch/arm/configs/multi_v7_defconfig | 2 + + arch/arm/configs/mvebu_v7_defconfig | 4 + + arch/arm/configs/omap2plus_defconfig | 3 + + arch/arm/kernel/smp_twd.c | 48 +- + arch/arm/mach-bcm/Makefile | 4 +- + arch/arm/mach-bcm/bcm63xx_headsmp.S | 23 - + arch/arm/mach-bcm/bcm63xx_smp.c | 4 +- + arch/arm/mach-bcm/bcm63xx_smp.h | 1 - + arch/arm/mach-cns3xxx/core.c | 55 +- + arch/arm/mach-davinci/time.c | 54 +- + arch/arm/mach-ep93xx/Kconfig | 54 - + arch/arm/mach-ep93xx/Makefile | 2 +- + arch/arm/mach-ep93xx/Makefile.boot | 15 +- + arch/arm/mach-ep93xx/core.c | 116 +- + arch/arm/mach-ep93xx/simone.c | 1 + + arch/arm/mach-ep93xx/timer-ep93xx.c | 140 ++ + arch/arm/mach-ep93xx/vision_ep9307.c | 61 +- + arch/arm/mach-footbridge/dc21285-timer.c | 48 +- + arch/arm/mach-gemini/time.c | 69 +- + arch/arm/mach-imx/epit.c | 67 +- + arch/arm/mach-ixp4xx/common.c | 68 +- + arch/arm/mach-ks8695/time.c | 43 +- + arch/arm/mach-lpc32xx/timer.c | 40 +- + arch/arm/mach-mmp/time.c | 29 +- + arch/arm/mach-mvebu/pmsu.c | 4 +- + arch/arm/mach-netx/time.c | 61 +- + arch/arm/mach-omap1/time.c | 35 +- + arch/arm/mach-omap1/timer32k.c | 33 +- + arch/arm/mach-omap2/pdata-quirks.c | 15 + + arch/arm/mach-omap2/timer.c | 48 +- + arch/arm/mach-orion5x/dns323-setup.c | 4 +- + arch/arm/mach-orion5x/tsx09-common.c | 4 +- + arch/arm/mach-rockchip/platsmp.c | 56 +- + arch/arm/mach-rockchip/pm.c | 45 +- + arch/arm/mach-rockchip/pm.h | 7 - + arch/arm/mach-shmobile/Kconfig | 33 - + arch/arm/mach-shmobile/Makefile | 8 +- + arch/arm/mach-shmobile/Makefile.boot | 2 - + arch/arm/mach-shmobile/board-armadillo800eva.c | 1365 -------------------- + arch/arm/mach-shmobile/board-kzm9g.c | 916 ------------- + arch/arm/mach-shmobile/clock-r8a7740.c | 675 ---------- + arch/arm/mach-shmobile/clock-sh73a0.c | 752 ----------- + arch/arm/mach-shmobile/dma-register.h | 84 -- + arch/arm/mach-shmobile/include/mach/head-kzm9g.txt | 410 ------ + arch/arm/mach-shmobile/include/mach/zboot.h | 19 - + arch/arm/mach-shmobile/include/mach/zboot_macros.h | 108 -- + arch/arm/mach-shmobile/intc-sh73a0.c | 337 ----- + arch/arm/mach-shmobile/pm-r8a7740.c | 129 -- + arch/arm/mach-shmobile/pm-r8a7779.c | 4 +- + arch/arm/mach-shmobile/pm-rcar.c | 105 +- + arch/arm/mach-shmobile/pm-rcar.h | 12 +- + arch/arm/mach-shmobile/pm-rmobile.c | 49 +- + arch/arm/mach-shmobile/pm-rmobile.h | 30 - + arch/arm/mach-shmobile/pm-sh73a0.c | 32 - + arch/arm/mach-shmobile/r8a7740.h | 58 - + arch/arm/mach-shmobile/setup-r8a7740.c | 678 +--------- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 2 - + arch/arm/mach-shmobile/setup-sh73a0.c | 739 +---------- + arch/arm/mach-shmobile/sh73a0.h | 83 -- + arch/arm/mach-shmobile/smp-r8a7779.c | 12 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 4 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 8 - + arch/arm/mach-shmobile/timer.c | 12 - + arch/arm/mach-spear/time.c | 89 +- + arch/arm/mach-w90x900/time.c | 51 +- + arch/arm/plat-iop/time.c | 70 +- + arch/arm/plat-orion/time.c | 93 +- + arch/arm64/Kconfig | 105 +- + arch/arm64/Kconfig.platforms | 114 ++ + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/rockchip/Makefile | 5 + + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 354 +++++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 900 +++++++++++++ + arch/arm64/boot/dts/sprd/sc9836.dtsi | 99 +- + arch/arm64/configs/defconfig | 2 + + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-inverter.c | 116 ++ + drivers/clk/rockchip/clk-mmc-phase.c | 6 +- + drivers/clk/rockchip/clk-rk3188.c | 9 +- + drivers/clk/rockchip/clk-rk3288.c | 13 +- + drivers/clk/rockchip/clk-rk3368.c | 881 +++++++++++++ + drivers/clk/rockchip/clk.c | 7 + + drivers/clk/rockchip/clk.h | 72 +- + drivers/memory/Kconfig | 8 + + drivers/memory/Makefile | 1 + + drivers/memory/pl172.c | 302 +++++ + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7793-clock.h | 164 +++ + include/dt-bindings/clock/rk3066a-cru.h | 5 + + include/dt-bindings/clock/rk3188-cru-common.h | 5 + + include/dt-bindings/clock/rk3188-cru.h | 5 + + include/dt-bindings/clock/rk3288-cru.h | 5 + + include/dt-bindings/clock/rk3368-cru.h | 384 ++++++ + include/dt-bindings/pinctrl/dra.h | 20 + + 177 files changed, 9314 insertions(+), 8047 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/arm,pl172.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/boot/compressed/head-shmobile.S + create mode 100644 arch/arm/boot/dts/cros-ec-sbs.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts + create mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts + create mode 100644 arch/arm/boot/dts/lpc4337-ciaa.dts + create mode 100644 arch/arm/boot/dts/omap3-overo-palo35-common.dtsi + create mode 100644 arch/arm/boot/dts/omap3-overo-palo35.dts + create mode 100644 arch/arm/boot/dts/omap3-overo-storm-palo35.dts + create mode 100644 arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts + create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi + create mode 100644 arch/arm/boot/dts/omap3-overo-tobiduo.dts + create mode 100644 arch/arm/boot/dts/r8a7793-gose.dts + create mode 100644 arch/arm/boot/dts/r8a7793.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-r89.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron-jerry.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-pinky.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron.dtsi + delete mode 100644 arch/arm/configs/armadillo800eva_defconfig + delete mode 100644 arch/arm/configs/kzm9g_defconfig + delete mode 100644 arch/arm/mach-bcm/bcm63xx_headsmp.S + create mode 100644 arch/arm/mach-ep93xx/timer-ep93xx.c + delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva.c + delete mode 100644 arch/arm/mach-shmobile/board-kzm9g.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a7740.c + delete mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c + delete mode 100644 arch/arm/mach-shmobile/dma-register.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/head-kzm9g.txt + delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h + delete mode 100644 arch/arm/mach-shmobile/intc-sh73a0.c + delete mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c + delete mode 100644 arch/arm/mach-shmobile/pm-sh73a0.c + delete mode 100644 arch/arm/mach-shmobile/r8a7740.h + create mode 100644 arch/arm64/Kconfig.platforms + create mode 100644 arch/arm64/boot/dts/rockchip/Makefile + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-r88.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368.dtsi + create mode 100644 drivers/clk/rockchip/clk-inverter.c + create mode 100644 drivers/clk/rockchip/clk-rk3368.c + create mode 100644 drivers/memory/pl172.c + create mode 100644 include/dt-bindings/clock/r8a7793-clock.h + create mode 100644 include/dt-bindings/clock/rk3368-cru.h +Merging at91/at91-next (dd1f58f398fb Merge branch 'at91-4.2-dt' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging rpi/for-rpi-next (50b674b89355 Merge branches 'for-rpi-next-soc' and 'for-rpi-next-dt' into for-rpi-next) +$ git merge rpi/for-rpi-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (d770e558e219 Linux 4.2-rc1) +$ git merge berlin/berlin/for-next +Already up-to-date. +Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M) +$ git merge cortex-m/for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (5228adb0e270 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig.debug +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/imx6ul-clock.txt | 13 + + .../devicetree/bindings/crypto/fsl-sec4.txt | 91 +- + .../devicetree/bindings/input/snvs-pwrkey.txt | 1 + + .../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 36 + + arch/arm/Kconfig.debug | 9 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx53-qsb-common.dtsi | 5 +- + arch/arm/boot/dts/imx53-qsrb.dts | 14 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 35 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 35 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 34 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 39 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 99 +++ + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 39 + + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 7 + + arch/arm/boot/dts/imx6qdl.dtsi | 52 +- + arch/arm/boot/dts/imx6sl-warp.dts | 32 +- + arch/arm/boot/dts/imx6sl.dtsi | 21 +- + arch/arm/boot/dts/imx6sx.dtsi | 28 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 278 ++++++ + arch/arm/boot/dts/imx6ul-pinfunc.h | 938 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 607 +++++++++++++ + arch/arm/boot/dts/imx7d.dtsi | 234 +++++ + arch/arm/boot/dts/ls1021a.dtsi | 4 +- + arch/arm/boot/dts/vfxxx.dtsi | 79 +- + arch/arm/configs/imx_v6_v7_defconfig | 29 +- + arch/arm/include/debug/imx-uart.h | 13 + + arch/arm/mach-imx/Kconfig | 8 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/cpu.c | 3 + + arch/arm/mach-imx/mach-imx6ul.c | 43 + + arch/arm/mach-imx/mxc.h | 6 + + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-imx6q.c | 4 + + drivers/clk/imx/clk-imx6ul.c | 432 ++++++++++ + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/snvs_pwrkey.c | 227 +++++ + drivers/rtc/Kconfig | 1 + + drivers/rtc/rtc-snvs.c | 132 +-- + include/dt-bindings/clock/imx6ul-clock.h | 240 ++++++ + 44 files changed, 3719 insertions(+), 168 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/imx6ul-clock.txt + create mode 100644 Documentation/devicetree/bindings/input/snvs-pwrkey.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6ul-pinctrl.txt + create mode 100644 arch/arm/boot/dts/imx6ul-14x14-evk.dts + create mode 100644 arch/arm/boot/dts/imx6ul-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx6ul.dtsi + create mode 100644 arch/arm/mach-imx/mach-imx6ul.c + create mode 100644 drivers/clk/imx/clk-imx6ul.c + create mode 100644 drivers/input/keyboard/snvs_pwrkey.c + create mode 100644 include/dt-bindings/clock/imx6ul-clock.h +Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (b66ba2c1292d Merge branch 'mvebu/config' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (f720de8fce5f Merge branch 'omap-for-v4.3/defconfig' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/timer.c +Auto-merging arch/arm/mach-omap2/io.c +Auto-merging arch/arm/mach-omap2/common.h +Merge made by the 'recursive' strategy. + arch/arm/configs/omap2plus_defconfig | 7 ++++ + arch/arm/mach-omap2/Makefile | 3 +- + arch/arm/mach-omap2/board-generic.c | 4 +-- + arch/arm/mach-omap2/common.h | 1 + + arch/arm/mach-omap2/io.c | 58 +++++++++++++++++++++++++++++++-- + arch/arm/mach-omap2/iomap.h | 63 ++++++++++++++++++++++++++++++++++++ + arch/arm/mach-omap2/omap-iommu.c | 13 +------- + arch/arm/mach-omap2/omap54xx.h | 8 +++++ + arch/arm/mach-omap2/timer.c | 15 +-------- + 9 files changed, 140 insertions(+), 32 deletions(-) +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f314c1bf7995] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging renesas/next (f1fc7fadfaf5 Merge branches 'heads/cleanup-for-v4.3', 'heads/defconfig-for-v4.3', 'heads/dt-for-v4.3', 'heads/soc-for-v4.3', 'heads/marzen-reference-board-removal-for-v4.3' and 'heads/fixes-for-v4.2' into next) +$ git merge renesas/next +Removing arch/arm/mach-shmobile/board-marzen-reference.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 - + arch/arm/boot/dts/emev2-kzm9d.dts | 8 ++++ + arch/arm/boot/dts/emev2.dtsi | 48 +++++++++++++++++++ + arch/arm/boot/dts/r8a7790-lager.dts | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- + arch/arm/configs/multi_v7_defconfig | 3 +- + arch/arm/configs/shmobile_defconfig | 4 +- + arch/arm/mach-shmobile/Kconfig | 12 ++--- + arch/arm/mach-shmobile/Makefile | 6 +-- + arch/arm/mach-shmobile/board-marzen-reference.c | 56 ---------------------- + arch/arm/mach-shmobile/clock-r8a7779.c | 2 +- + arch/arm/mach-shmobile/platsmp-apmu.c | 4 +- + arch/arm/mach-shmobile/r8a7779.h | 2 - + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 3 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 17 ++++++- + arch/arm/mach-shmobile/setup-r8a7793.c | 33 +++++++++++++ + 16 files changed, 125 insertions(+), 78 deletions(-) + delete mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c + create mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c +Merging samsung/for-next (bcddc3a84e49 arm64: dts: Add thermal-zones dt node for exynos5433) +$ git merge samsung/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++ + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 + + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++ + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++ + 5 files changed, 1883 insertions(+) + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi +Merging samsung-krzk/for-next (614a3a4aedc7 Merge branch 'defconfig-for-next' into for-next) +$ git merge samsung-krzk/for-next +Removing drivers/cpufreq/exynos5250-cpufreq.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 + + arch/arm/boot/dts/exynos4210-trats.dts | 4 + + arch/arm/boot/dts/exynos4210-universal_c210.dts | 618 ++++---- + arch/arm/boot/dts/exynos4210.dtsi | 12 + + arch/arm/boot/dts/exynos4412-trats2.dts | 3 + + arch/arm/boot/dts/exynos5250-arndale.dts | 4 + + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 1600 ++++++++++---------- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 + + arch/arm/boot/dts/exynos5250-snow.dts | 4 + + arch/arm/boot/dts/exynos5250-spring.dts | 4 + + arch/arm/boot/dts/exynos5250.dtsi | 25 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 6 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 1411 +++++++++-------- + arch/arm/boot/dts/exynos5420.dtsi | 3 +- + arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi | 59 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 46 + + arch/arm/configs/exynos_defconfig | 3 + + arch/arm/configs/multi_v7_defconfig | 5 +- + arch/arm/mach-exynos/common.h | 6 + + arch/arm/mach-exynos/exynos.c | 1 + + arch/arm/mach-exynos/firmware.c | 2 - + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm/mach-exynos/pmu.c | 3 +- + arch/arm/mach-exynos/suspend.c | 4 +- + drivers/clk/samsung/clk-exynos5250.c | 31 + + drivers/cpufreq/Kconfig.arm | 11 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/exynos-cpufreq.c | 9 +- + drivers/cpufreq/exynos-cpufreq.h | 17 - + drivers/cpufreq/exynos5250-cpufreq.c | 210 --- + include/dt-bindings/clock/exynos5250.h | 1 + + 33 files changed, 2042 insertions(+), 2075 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5422-cpu-thermal.dtsi + delete mode 100644 drivers/cpufreq/exynos5250-cpufreq.c +Merging sunxi/sunxi/for-next (2676ca3b2993 Merge branch 'sunxi/dt-for-4.3' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 15 +++ + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 34 ++++++ + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 19 ++++ + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 15 +++ + arch/arm/boot/dts/sun4i-a10.dtsi | 13 +++ + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 27 +++++ + arch/arm/boot/dts/sun5i.dtsi | 13 +++ + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 5 + + arch/arm/boot/dts/sun6i-a31.dtsi | 13 +++ + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 5 + + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 27 +++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 32 ++++++ + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 32 ++++++ + arch/arm/boot/dts/sun7i-a20.dtsi | 13 +++ + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 22 ++++ + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 9 ++ + arch/arm/boot/dts/sun8i-a23.dtsi | 33 ++++++ + arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 17 +++ + arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts | 118 +++++++++++++++++++++ + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 13 +++ + arch/arm/boot/dts/sun8i-a33.dtsi | 33 ++++++ + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 2 + + 24 files changed, 512 insertions(+) + create mode 100644 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts +Merging tegra/for-next (7124274285a4 Merge branch for-4.3/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/cpufreq/Kconfig.arm +Merge made by the 'recursive' strategy. + .../bindings/clock/nvidia,tegra124-dfll.txt | 79 + + .../bindings/cpufreq/tegra124-cpufreq.txt | 44 + + .../bindings/sound/nvidia,tegra30-hda.txt | 8 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 25 +- + arch/arm/boot/dts/tegra124-venice2.dts | 10 +- + arch/arm/boot/dts/tegra124.dtsi | 37 + + arch/arm/configs/tegra_defconfig | 4 + + arch/arm/mach-tegra/Kconfig | 1 + + arch/arm/mach-tegra/iomap.h | 3 - + drivers/clk/tegra/Makefile | 3 + + drivers/clk/tegra/clk-dfll.c | 1755 ++++++++++++++++++++ + drivers/clk/tegra/clk-dfll.h | 54 + + drivers/clk/tegra/clk-tegra-super-gen4.c | 4 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 166 ++ + drivers/clk/tegra/clk-tegra124.c | 82 + + drivers/clk/tegra/clk.c | 39 +- + drivers/clk/tegra/clk.h | 3 + + drivers/clk/tegra/cvb.c | 140 ++ + drivers/clk/tegra/cvb.h | 67 + + drivers/cpufreq/Kconfig.arm | 13 +- + drivers/cpufreq/Makefile | 3 +- + drivers/cpufreq/tegra124-cpufreq.c | 214 +++ + .../cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} | 0 + drivers/memory/tegra/tegra124-emc.c | 42 +- + drivers/soc/tegra/common.c | 2 + + drivers/soc/tegra/fuse/Makefile | 2 + + drivers/soc/tegra/fuse/fuse-tegra.c | 257 ++- + drivers/soc/tegra/fuse/fuse-tegra20.c | 175 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 232 +-- + drivers/soc/tegra/fuse/fuse.h | 95 +- + drivers/soc/tegra/fuse/speedo-tegra114.c | 22 +- + drivers/soc/tegra/fuse/speedo-tegra124.c | 26 +- + drivers/soc/tegra/fuse/speedo-tegra20.c | 28 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 184 ++ + drivers/soc/tegra/fuse/speedo-tegra30.c | 48 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 76 +- + drivers/soc/tegra/pmc.c | 108 +- + include/dt-bindings/reset/tegra124-car.h | 12 + + include/soc/tegra/fuse.h | 6 +- + include/soc/tegra/pmc.h | 5 + + 40 files changed, 3612 insertions(+), 462 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt + create mode 100644 Documentation/devicetree/bindings/cpufreq/tegra124-cpufreq.txt + create mode 100644 drivers/clk/tegra/clk-dfll.c + create mode 100644 drivers/clk/tegra/clk-dfll.h + create mode 100644 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c + create mode 100644 drivers/clk/tegra/cvb.c + create mode 100644 drivers/clk/tegra/cvb.h + create mode 100644 drivers/cpufreq/tegra124-cpufreq.c + rename drivers/cpufreq/{tegra-cpufreq.c => tegra20-cpufreq.c} (100%) + create mode 100644 drivers/soc/tegra/fuse/speedo-tegra210.c + create mode 100644 include/dt-bindings/reset/tegra124-car.h +Merging arm64/for-next/core (f871d2680707 arm64: Fix show_unhandled_signal_ratelimited usage) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (960a2741d5fd c67: irq: Use __handle_domain_irq()) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/Kconfig | 1 + + arch/c6x/kernel/irq.c | 13 ++----------- + 2 files changed, 3 insertions(+), 11 deletions(-) +Merging cris/for-next (1e4d6e13d050 cris: don't use module_init for non-modular core eeprom.c code) +$ git merge cris/for-next +Recorded preimage for 'arch/cris/include/asm/Kbuild' +Removing arch/cris/include/uapi/asm/types.h +Removing arch/cris/include/uapi/asm/statfs.h +Removing arch/cris/include/uapi/asm/sockios.h +Removing arch/cris/include/uapi/asm/socket.h +Removing arch/cris/include/uapi/asm/siginfo.h +Removing arch/cris/include/uapi/asm/shmbuf.h +Removing arch/cris/include/uapi/asm/sembuf.h +Removing arch/cris/include/uapi/asm/resource.h +Removing arch/cris/include/uapi/asm/poll.h +Removing arch/cris/include/uapi/asm/msgbuf.h +Removing arch/cris/include/uapi/asm/mman.h +Removing arch/cris/include/uapi/asm/kvm_para.h +Removing arch/cris/include/uapi/asm/ipcbuf.h +Removing arch/cris/include/uapi/asm/ioctl.h +Removing arch/cris/include/uapi/asm/fcntl.h +Removing arch/cris/include/uapi/asm/errno.h +Auto-merging arch/cris/include/uapi/asm/elf_v32.h +Auto-merging arch/cris/include/uapi/asm/elf_v10.h +Auto-merging arch/cris/include/uapi/asm/elf.h +Removing arch/cris/include/uapi/asm/bitsperlong.h +Removing arch/cris/include/uapi/asm/auxvec.h +Removing arch/cris/include/asm/types.h +Auto-merging arch/cris/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild +Removing arch/cris/arch-v10/lib/old_checksum.c +Removing arch/cris/arch-v10/lib/dmacopy.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/cris/include/asm/Kbuild'. +[master 5a29d8e30157] Merge remote-tracking branch 'cris/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/cris/Kconfig | 12 +++ + arch/cris/arch-v10/kernel/entry.S | 8 ++ + arch/cris/arch-v10/lib/dmacopy.c | 42 ---------- + arch/cris/arch-v10/lib/old_checksum.c | 86 -------------------- + arch/cris/arch-v32/drivers/Kconfig | 16 ++-- + arch/cris/arch-v32/drivers/axisflashmap.c | 9 ++- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 4 +- + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +- + arch/cris/arch-v32/kernel/entry.S | 19 +++++ + arch/cris/arch-v32/kernel/process.c | 4 +- + arch/cris/arch-v32/kernel/signal.c | 1 - + arch/cris/arch-v32/mach-fs/pinmux.c | 8 +- + arch/cris/configs/artpec_3_defconfig | 5 +- + arch/cris/configs/etraxfs_defconfig | 1 + + arch/cris/include/arch-v32/arch/bug.h | 11 ++- + arch/cris/include/arch-v32/arch/irqflags.h | 2 +- + arch/cris/include/asm/Kbuild | 17 ++++ + arch/cris/include/asm/mmu_context.h | 9 ++- + arch/cris/include/asm/stacktrace.h | 8 ++ + arch/cris/include/asm/types.h | 12 --- + arch/cris/include/asm/unistd.h | 2 +- + arch/cris/include/uapi/asm/Kbuild | 5 ++ + arch/cris/include/uapi/asm/auxvec.h | 4 - + arch/cris/include/uapi/asm/bitsperlong.h | 1 - + arch/cris/include/{ => uapi}/asm/elf.h | 9 ++- + .../{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} | 5 +- + .../{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} | 5 +- + arch/cris/include/uapi/asm/errno.h | 6 -- + arch/cris/include/uapi/asm/fcntl.h | 1 - + arch/cris/include/uapi/asm/ioctl.h | 1 - + arch/cris/include/uapi/asm/ipcbuf.h | 1 - + arch/cris/include/uapi/asm/kvm_para.h | 1 - + arch/cris/include/uapi/asm/mman.h | 1 - + arch/cris/include/uapi/asm/msgbuf.h | 33 -------- + arch/cris/include/uapi/asm/poll.h | 1 - + arch/cris/include/uapi/asm/ptrace.h | 6 +- + .../arch/ptrace.h => uapi/asm/ptrace_v10.h} | 0 + .../arch/ptrace.h => uapi/asm/ptrace_v32.h} | 0 + arch/cris/include/uapi/asm/resource.h | 6 -- + arch/cris/include/uapi/asm/sembuf.h | 25 ------ + arch/cris/include/uapi/asm/shmbuf.h | 42 ---------- + arch/cris/include/uapi/asm/siginfo.h | 6 -- + arch/cris/include/uapi/asm/socket.h | 92 ---------------------- + arch/cris/include/uapi/asm/sockios.h | 13 --- + arch/cris/include/uapi/asm/statfs.h | 6 -- + arch/cris/include/uapi/asm/types.h | 1 - + arch/cris/include/uapi/asm/unistd.h | 8 ++ + arch/cris/kernel/Makefile | 1 + + arch/cris/kernel/irq.c | 6 +- + arch/cris/kernel/stacktrace.c | 76 ++++++++++++++++++ + 50 files changed, 220 insertions(+), 421 deletions(-) + delete mode 100644 arch/cris/arch-v10/lib/dmacopy.c + delete mode 100644 arch/cris/arch-v10/lib/old_checksum.c + create mode 100644 arch/cris/include/asm/stacktrace.h + delete mode 100644 arch/cris/include/asm/types.h + delete mode 100644 arch/cris/include/uapi/asm/auxvec.h + delete mode 100644 arch/cris/include/uapi/asm/bitsperlong.h + rename arch/cris/include/{ => uapi}/asm/elf.h (95%) + rename arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} (98%) + rename arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} (98%) + delete mode 100644 arch/cris/include/uapi/asm/errno.h + delete mode 100644 arch/cris/include/uapi/asm/fcntl.h + delete mode 100644 arch/cris/include/uapi/asm/ioctl.h + delete mode 100644 arch/cris/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/cris/include/uapi/asm/kvm_para.h + delete mode 100644 arch/cris/include/uapi/asm/mman.h + delete mode 100644 arch/cris/include/uapi/asm/msgbuf.h + delete mode 100644 arch/cris/include/uapi/asm/poll.h + rename arch/cris/include/{arch-v10/arch/ptrace.h => uapi/asm/ptrace_v10.h} (100%) + rename arch/cris/include/{arch-v32/arch/ptrace.h => uapi/asm/ptrace_v32.h} (100%) + delete mode 100644 arch/cris/include/uapi/asm/resource.h + delete mode 100644 arch/cris/include/uapi/asm/sembuf.h + delete mode 100644 arch/cris/include/uapi/asm/shmbuf.h + delete mode 100644 arch/cris/include/uapi/asm/siginfo.h + delete mode 100644 arch/cris/include/uapi/asm/socket.h + delete mode 100644 arch/cris/include/uapi/asm/sockios.h + delete mode 100644 arch/cris/include/uapi/asm/statfs.h + delete mode 100644 arch/cris/include/uapi/asm/types.h + create mode 100644 arch/cris/kernel/stacktrace.c +Merging h8300/h8300-next (52b2512d507d asm-generic: {get,put}_user ptr argument evaluate only 1 time) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/renesas,h8300-div-clock.txt | 2 +- + drivers/clk/h8300/clk-h8s2678.c | 1 + + include/asm-generic/uaccess.h | 10 ++++++---- + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (ae40b7e28752 Merge branch 'misc-4.2' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (1214c525484c m68k: Use for_each_sg()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (67592f699cb3 m68k: enable PCI support for m5475evb defconfig) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (7ce0c22b0787 metag/irq: Use access helper irq_data_get_affinity_mask()) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/kernel/irq.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging microblaze/next (c4fa9a6ae285 microblaze/PCI: Remove unnecessary struct pci_dev declaration) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (fed13add7d32 Merge branch '4.2-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/asm/debug.h +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 14 +- + arch/mips/Kconfig.debug | 9 - + arch/mips/alchemy/common/irq.c | 4 +- + arch/mips/alchemy/devboards/bcsr.c | 6 +- + arch/mips/ath79/irq.c | 19 +- + arch/mips/bcm63xx/irq.c | 6 +- + arch/mips/cavium-octeon/octeon-irq.c | 36 +-- + arch/mips/include/asm/Kbuild | 1 - + arch/mips/include/asm/abi.h | 4 + + arch/mips/include/asm/asmmacro.h | 114 ++++++++ + arch/mips/include/asm/cdmm.h | 4 +- + arch/mips/include/asm/cpu-type.h | 4 + + arch/mips/include/asm/cpu.h | 2 + + arch/mips/include/asm/debug.h | 48 ---- + arch/mips/include/asm/elf.h | 4 +- + arch/mips/include/asm/irq.h | 2 +- + arch/mips/include/asm/linkage.h | 1 - + arch/mips/include/asm/maar.h | 2 +- + arch/mips/include/asm/mips-cm.h | 97 ++++++- + arch/mips/include/asm/mips-cpc.h | 10 - + arch/mips/include/asm/mipsregs.h | 8 +- + arch/mips/include/asm/msa.h | 80 ++++++ + arch/mips/include/asm/signal.h | 3 + + arch/mips/include/asm/time.h | 4 +- + arch/mips/include/asm/vpe.h | 2 +- + arch/mips/include/uapi/asm/hwcap.h | 8 + + arch/mips/include/uapi/asm/inst.h | 31 ++- + arch/mips/include/uapi/asm/sigcontext.h | 12 + + arch/mips/include/uapi/asm/ucontext.h | 65 +++++ + arch/mips/jz4740/gpio.c | 4 +- + arch/mips/kernel/asm-offsets.c | 11 - + arch/mips/kernel/cevt-r4k.c | 11 +- + arch/mips/kernel/cpu-probe.c | 54 +++- + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/mips-cm.c | 257 +++++++++++++++++- + arch/mips/kernel/mips-cpc.c | 11 +- + arch/mips/kernel/perf_event_mipsxx.c | 13 +- + arch/mips/kernel/pm-cps.c | 2 + + arch/mips/kernel/prom.c | 2 +- + arch/mips/kernel/r4k_fpu.S | 436 ++++++++++++++++++------------- + arch/mips/kernel/signal-common.h | 9 + + arch/mips/kernel/signal.c | 446 ++++++++++++++++++++++++-------- + arch/mips/kernel/signal32.c | 207 +-------------- + arch/mips/kernel/signal_n32.c | 6 +- + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/time.c | 9 +- + arch/mips/kernel/traps.c | 1 + + arch/mips/kernel/unaligned.c | 72 ++++++ + arch/mips/kernel/vpe.c | 7 +- + arch/mips/math-emu/cp1emu.c | 29 ++- + arch/mips/math-emu/ieee754int.h | 8 +- + arch/mips/mm/c-r4k.c | 1 + + arch/mips/mm/init.c | 36 ++- + arch/mips/mm/sc-mips.c | 42 +++ + arch/mips/mti-malta/malta-init.c | 7 + + arch/mips/mti-malta/malta-int.c | 112 +------- + arch/mips/mti-malta/malta-memory.c | 25 -- + arch/mips/netlogic/common/smp.c | 6 +- + arch/mips/oprofile/common.c | 1 + + arch/mips/oprofile/op_model_mipsxx.c | 12 +- + arch/mips/pci/ops-emma2rh.c | 6 +- + arch/mips/pci/pci-ar71xx.c | 4 +- + arch/mips/pci/pci-ar724x.c | 4 +- + arch/mips/pci/pci-rt3883.c | 7 +- + arch/mips/pmcs-msp71xx/msp_irq_cic.c | 3 +- + drivers/bus/mips_cdmm.c | 14 +- + drivers/cpufreq/loongson2_cpufreq.c | 2 +- + drivers/irqchip/irq-mips-gic.c | 142 ++++++---- + drivers/tty/mips_ejtag_fdc.c | 9 +- + include/linux/irqchip/mips-gic.h | 14 +- + 70 files changed, 1771 insertions(+), 873 deletions(-) + delete mode 100644 arch/mips/include/asm/debug.h + create mode 100644 arch/mips/include/uapi/asm/hwcap.h + create mode 100644 arch/mips/include/uapi/asm/ucontext.h +Merging nios2/nios2-next (a8955cc3a504 nios2: check number of timer instances) +$ git merge nios2/nios2-next +Already up-to-date. +Merging parisc-hd/for-next (9d37e6679dfd Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (bd664f892e3e cxl: Destroy afu->contexts_idr on release of an afu) +$ git merge powerpc/next +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 4 + + arch/powerpc/include/asm/device.h | 15 ++- + arch/powerpc/include/asm/dma-mapping.h | 14 +-- + arch/powerpc/include/asm/iommu.h | 31 +++++- + arch/powerpc/include/asm/opal-api.h | 40 +++++++ + arch/powerpc/include/asm/opal.h | 3 +- + arch/powerpc/include/asm/reg.h | 3 +- + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/dma-swiotlb.c | 4 +- + arch/powerpc/kernel/dma.c | 111 ++++++++++++++++--- + arch/powerpc/kernel/prom_init.c | 25 +++-- + arch/powerpc/oprofile/op_model_power4.c | 4 +- + arch/powerpc/platforms/powernv/opal-power.c | 147 ++++++++++++++++++++++--- + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + + arch/powerpc/platforms/powernv/pci-ioda.c | 134 +++++++++------------- + arch/powerpc/platforms/powernv/pci.h | 5 +- + arch/powerpc/platforms/pseries/iommu.c | 3 +- + arch/powerpc/sysdev/dart_iommu.c | 16 +-- + drivers/misc/cxl/irq.c | 32 +++--- + drivers/misc/cxl/main.c | 1 + + drivers/misc/cxl/native.c | 10 +- + drivers/misc/cxl/pci.c | 11 +- + drivers/misc/cxl/trace.h | 10 +- + 23 files changed, 425 insertions(+), 201 deletions(-) +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging powerpc-benh/next (65e7bb2a34fe Merge branch 'next-sriov' into next) +$ git merge powerpc-benh/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fsl/next (f1b3b4450dcb powerpc/85xx: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (20a8f53065e2 s390/cio: Fix comma) +$ git merge s390/features +Auto-merging arch/s390/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 1 + + arch/s390/crypto/aes_s390.c | 3 +- + arch/s390/crypto/des_s390.c | 3 +- + arch/s390/crypto/ghash_s390.c | 3 +- + arch/s390/crypto/prng.c | 4 +- + arch/s390/crypto/sha1_s390.c | 3 +- + arch/s390/crypto/sha256_s390.c | 3 +- + arch/s390/crypto/sha512_s390.c | 3 +- + arch/s390/include/asm/cpufeature.h | 29 ++ + arch/s390/include/asm/ctl_reg.h | 2 + + arch/s390/include/asm/fpu-internal.h | 110 +++++++ + arch/s390/include/asm/kvm_host.h | 6 +- + arch/s390/include/asm/linkage.h | 22 ++ + arch/s390/include/asm/pci.h | 6 +- + arch/s390/include/asm/processor.h | 25 +- + arch/s390/include/asm/switch_to.h | 135 +------- + arch/s390/include/asm/vx-insn.h | 480 +++++++++++++++++++++++++++ + arch/s390/kernel/asm-offsets.c | 5 + + arch/s390/kernel/compat_signal.c | 48 +-- + arch/s390/kernel/entry.S | 613 +++++++++++++++++++++++++---------- + arch/s390/kernel/nmi.c | 9 +- + arch/s390/kernel/process.c | 52 ++- + arch/s390/kernel/processor.c | 9 + + arch/s390/kernel/ptrace.c | 174 +++++----- + arch/s390/kernel/s390_ksyms.c | 3 + + arch/s390/kernel/setup.c | 2 +- + arch/s390/kernel/signal.c | 47 +-- + arch/s390/kernel/traps.c | 34 +- + arch/s390/kvm/kvm-s390.c | 130 ++++++-- + arch/s390/pci/pci.c | 21 +- + arch/s390/pci/pci_dma.c | 8 +- + arch/s390/pci/pci_sysfs.c | 6 +- + drivers/s390/char/sclp.c | 6 +- + drivers/s390/cio/device_ops.c | 2 +- + include/linux/cpufeature.h | 7 +- + 35 files changed, 1425 insertions(+), 589 deletions(-) + create mode 100644 arch/s390/include/asm/cpufeature.h + create mode 100644 arch/s390/include/asm/fpu-internal.h + create mode 100644 arch/s390/include/asm/vx-insn.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 (d770e558e219 Linux 4.2-rc1) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (46acfb806813 um: Fix out-of-tree build) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (1203b34261e4 xtensa: fix threadptr reload on return to userspace) +$ git merge xtensa/for_next +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/entry.S | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging btrfs/next (5a5003df98d5 btrfs: delayed-ref: double free in btrfs_add_delayed_tree_ref()) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (64c1797a9371 libceph: Remove spurious kunmap() of the zero page) +$ git merge ceph/master +Merge made by the 'recursive' strategy. +Merging cifs/for-next (6468ffb3e9da cifs: Fix use-after-free on mid_q_entry) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_ioctl.h | 42 ++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifspdu.h | 14 ++++++++++++++ + fs/cifs/cifssmb.c | 7 +++++++ + fs/cifs/ioctl.c | 48 ++++++++++++++++++++++++++++++++++++++++++------ + fs/cifs/smb2pdu.c | 7 +++++++ + fs/cifs/transport.c | 2 ++ + 7 files changed, 115 insertions(+), 7 deletions(-) + create mode 100644 fs/cifs/cifs_ioctl.h +Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (70f19f5869c5 udf: Don't corrupt unalloc spacetable when writing it) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/inode.c | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) +Merging ext4/dev (7444a072c387 ext4: replace open coded nofail allocation in ext4_free_blocks()) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (f99fc27c7346 f2fs: shrink unreferenced extent_caches first) +$ git merge f2fs/dev +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 4 +- + MAINTAINERS | 1 + + fs/f2fs/Makefile | 1 + + fs/f2fs/checkpoint.c | 3 +- + fs/f2fs/crypto_key.c | 3 +- + fs/f2fs/data.c | 425 ++++++++++++++----------------------- + fs/f2fs/f2fs.h | 39 +++- + fs/f2fs/file.c | 14 ++ + fs/f2fs/gc.c | 12 +- + fs/f2fs/inode.c | 37 ++-- + fs/f2fs/namei.c | 15 +- + fs/f2fs/node.c | 6 +- + fs/f2fs/segment.c | 11 +- + fs/f2fs/shrinker.c | 125 +++++++++++ + fs/f2fs/super.c | 50 ++++- + include/trace/events/f2fs.h | 12 +- + 16 files changed, 445 insertions(+), 313 deletions(-) + create mode 100644 fs/f2fs/shrinker.c +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. + fs/fscache/netfs.c | 38 ++++++++++++++++++-------------------- + 1 file changed, 18 insertions(+), 20 deletions(-) +Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (ea79f0ec7a38 GFS2: Make ht_parms static) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 304 ++++++++++++++++++++------------------------------- + fs/gfs2/glops.c | 38 ++++--- + fs/gfs2/incore.h | 13 ++- + fs/gfs2/lock_dlm.c | 10 +- + fs/gfs2/lops.c | 6 +- + fs/gfs2/meta_io.c | 6 +- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/quota.c | 22 ++-- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trace_gfs2.h | 18 +-- + fs/gfs2/trans.c | 4 +- + 11 files changed, 181 insertions(+), 244 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (faa4a54f0be1 pNFS: Don't throw out valid layout segments) +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Auto-merging fs/nfs/nfs4proc.c +Merge made by the 'recursive' strategy. + fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- + fs/nfs/nfs4proc.c | 20 ++++--- + fs/nfs/nfs4state.c | 29 ++++++---- + fs/nfs/pnfs.c | 96 +++++++++++++++++++--------------- + net/sunrpc/clnt.c | 5 +- + net/sunrpc/xprtsock.c | 3 +- + 6 files changed, 90 insertions(+), 65 deletions(-) +Merging nfsd/nfsd-next (8c7fe4141707 nfsd: Fix a memory leak of struct file_lock) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/nfs/nfs-rdma.txt | 16 ++-- + fs/lockd/svc.c | 7 +- + fs/namei.c | 74 +++++++++++++++++++ + fs/nfs/callback.c | 6 +- + fs/nfsd/idmap.h | 4 +- + fs/nfsd/nfs2acl.c | 10 +-- + fs/nfsd/nfs3acl.c | 4 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4acl.c | 4 +- + fs/nfsd/nfs4idmap.c | 3 - + fs/nfsd/nfs4layouts.c | 1 + + fs/nfsd/nfs4proc.c | 6 +- + fs/nfsd/nfs4recover.c | 12 ++- + fs/nfsd/nfs4state.c | 1 + + fs/nfsd/nfs4xdr.c | 19 ++--- + fs/nfsd/nfssvc.c | 17 ++++- + fs/nfsd/vfs.c | 23 +++--- + include/linux/namei.h | 1 + + include/linux/sunrpc/svc.h | 68 ++++++++++++----- + include/linux/sunrpc/svc_rdma.h | 84 +-------------------- + include/linux/sunrpc/svc_xprt.h | 1 + + include/uapi/linux/nfsacl.h | 1 + + net/sunrpc/svc.c | 113 ++++++++++++++--------------- + net/sunrpc/svc_xprt.c | 10 +-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 83 ++++++++++++++++++++- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 35 +-------- + 26 files changed, 346 insertions(+), 259 deletions(-) +Merging overlayfs/overlayfs-next (cdb672795876 ovl: lookup whiteouts outside iterate_dir()) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (669d3d123395 UBI: Remove unnecessary `\') +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (bc0195aad0da Linux 4.2-rc2) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (ee296d7c5709 locks: inline posix_lock_file_wait and flock_lock_file_wait) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (0f1db7dee200 9p: cope with bogus responses from server in p9_client_{read,write}) +$ git merge vfs/for-next +Already up-to-date. +Merging pci/next (bc0195aad0da Linux 4.2-rc2) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (9f6355c7b6e8 Merge branch 'for-4.3/rmi' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-cp2112.c | 109 ++++++++++++++++++------ + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 5 +- + drivers/hid/hid-multitouch.c | 7 ++ + drivers/hid/hid-picolcd_backlight.c | 3 +- + drivers/hid/hid-picolcd_cir.c | 3 +- + drivers/hid/hid-picolcd_lcd.c | 3 +- + drivers/hid/hid-rmi.c | 163 ++++++++++++++++++++++++++++++++---- + drivers/hid/hid-sensor-hub.c | 3 + + drivers/hid/hid-sony.c | 9 +- + drivers/hid/i2c-hid/i2c-hid.c | 6 +- + drivers/hid/usbhid/hid-core.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 3 + + drivers/hid/wacom_sys.c | 64 ++++++-------- + drivers/hid/wacom_wac.c | 7 +- + 15 files changed, 294 insertions(+), 97 deletions(-) +Merging i2c/i2c/for-next (19e0ff423382 i2c: omap: fix cleanup regression) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-emev2.txt | 22 + + drivers/clk/shmobile/clk-emev2.c | 6 + + drivers/i2c/busses/Kconfig | 7 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-emev2.c | 332 ++++++++++++ + drivers/i2c/busses/i2c-omap.c | 600 ++++++++++----------- + drivers/i2c/busses/i2c-parport.c | 25 +- + drivers/i2c/busses/i2c-pxa.c | 112 ++-- + drivers/i2c/busses/i2c-xiic.c | 74 ++- + 9 files changed, 764 insertions(+), 415 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-emev2.txt + create mode 100644 drivers/i2c/busses/i2c-emev2.c +Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + drivers/hwmon/k10temp.c | 1 - + 1 file changed, 1 deletion(-) +Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (1840cf8ac8dc hwmon: (f71882fg) Add support for f81768d) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/f71882fg.c | 176 ++++++++++++++++++++++++++++++++++-------- + drivers/hwmon/nct7802.c | 195 +++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 326 insertions(+), 45 deletions(-) +Merging v4l-dvb/master (5bab86243d94 [media] media/pci/cobalt: fix Kconfig and build when SND is not enabled) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. + drivers/media/dvb-frontends/Kconfig | 2 +- + drivers/media/pci/cobalt/Kconfig | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging kbuild/for-next (31d61069530b Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging init/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .gitignore | 4 + + Documentation/lto-build | 173 ++++++++++++++++++++++++++++ + Makefile | 19 ++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 ++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/api/simple_open.cocci | 4 +- + scripts/coccinelle/api/vma_pages.cocci | 60 ++++++++++ + scripts/coccinelle/misc/ifaddr.cocci | 3 +- + scripts/coccinelle/misc/irqf_oneshot.cocci | 7 +- + scripts/coccinelle/misc/returnvar.cocci | 2 +- + scripts/coccinelle/misc/semicolon.cocci | 2 +- + scripts/coccinelle/misc/simple_return.cocci | 2 +- + scripts/link-vmlinux.sh | 2 +- + scripts/package/Makefile | 8 +- + scripts/package/builddeb | 31 +++-- + scripts/package/mkspec | 4 +- + 21 files changed, 459 insertions(+), 34 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + create mode 100644 scripts/coccinelle/api/vma_pages.cocci +Merging kconfig/for-next (b953c0d234bc Linux 4.1) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (e695342e5aea Merge branch 'for-4.2-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/libata-core.c | 21 ++++++++++++++++++--- + drivers/ata/libata-pmp.c | 7 +++++++ + drivers/ata/libata-scsi.c | 3 ++- + drivers/ata/libata-transport.c | 2 ++ + drivers/ata/sata_rcar.c | 4 ---- + include/linux/ata.h | 1 + + include/linux/libata.h | 2 ++ + 7 files changed, 32 insertions(+), 8 deletions(-) +Merging pm/linux-next (03b60e04284e Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-domains' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/power_domain.txt | 2 +- + Documentation/power/devices.txt | 7 + + Documentation/power/runtime_pm.txt | 4 - + drivers/acpi/ac.c | 4 - + drivers/acpi/acpi_ipmi.c | 4 - + drivers/acpi/acpi_memhotplug.c | 5 - + drivers/acpi/acpi_pad.c | 4 - + drivers/acpi/acpi_video.c | 4 - + drivers/acpi/apei/apei-base.c | 4 - + drivers/acpi/apei/einj.c | 4 - + drivers/acpi/apei/erst-dbg.c | 4 - + drivers/acpi/apei/erst.c | 4 - + drivers/acpi/apei/ghes.c | 4 - + drivers/acpi/apei/hest.c | 4 - + drivers/acpi/battery.c | 4 - + drivers/acpi/blacklist.c | 4 - + drivers/acpi/bus.c | 4 - + drivers/acpi/button.c | 4 - + drivers/acpi/cm_sbs.c | 4 - + drivers/acpi/container.c | 4 - + drivers/acpi/device_pm.c | 4 - + drivers/acpi/dock.c | 4 - + drivers/acpi/ec.c | 4 - + drivers/acpi/fan.c | 4 - + drivers/acpi/hed.c | 4 - + drivers/acpi/internal.h | 3 - + drivers/acpi/numa.c | 4 - + drivers/acpi/osl.c | 4 - + drivers/acpi/pci_irq.c | 4 - + drivers/acpi/pci_link.c | 4 - + drivers/acpi/pci_root.c | 4 - + drivers/acpi/pci_slot.c | 4 - + drivers/acpi/power.c | 19 +- + drivers/acpi/processor_driver.c | 4 - + drivers/acpi/processor_idle.c | 4 - + drivers/acpi/processor_perflib.c | 4 - + drivers/acpi/processor_thermal.c | 4 - + drivers/acpi/processor_throttling.c | 4 - + drivers/acpi/resource.c | 4 - + drivers/acpi/sbs.c | 4 - + drivers/acpi/tables.c | 4 - + drivers/acpi/thermal.c | 4 - + drivers/acpi/utils.c | 4 - + drivers/base/power/domain.c | 363 ++++----------------- + drivers/base/power/main.c | 2 +- + drivers/cpufreq/acpi-cpufreq.c | 44 +-- + drivers/cpufreq/cpufreq.c | 35 +- + drivers/cpufreq/integrator-cpufreq.c | 18 +- + drivers/cpufreq/intel_pstate.c | 11 +- + include/acpi/acpi_bus.h | 4 - + include/acpi/acpi_drivers.h | 4 - + include/linux/acpi.h | 4 - + include/linux/pm_domain.h | 7 - + include/linux/pm_runtime.h | 6 - + kernel/power/snapshot.c | 69 +++- + kernel/power/wakelock.c | 18 +- + 56 files changed, 213 insertions(+), 560 deletions(-) +Merging idle/next (a576d08d4eb2 Merge branches 'cpuidle' and 'turbostat' into release) +$ git merge idle/next +Merge made by the 'recursive' strategy. + drivers/idle/intel_idle.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (111b23cf895b Merge branches 'release' and 'thermal-soc' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (b89384e9e8c0 Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (023600f192be swiotlb: do not export map_single function) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (37d7079a3425 Merge branch 'topic/zxdma' into next) +$ git merge slave-dma/next +Auto-merging drivers/gpu/ipu-v3/ipu-common.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/apm-xgene-dma.txt | 2 +- + Documentation/devicetree/bindings/dma/zxdma.txt | 38 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +- + drivers/dma/Kconfig | 7 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 138 ++-- + drivers/dma/at_hdmac_regs.h | 3 +- + drivers/dma/at_xdmac.c | 38 +- + drivers/dma/hsu/hsu.c | 39 +- + drivers/dma/hsu/hsu.h | 1 - + drivers/dma/imx-dma.c | 23 +- + drivers/dma/ioat/dma_v3.c | 3 + + drivers/dma/ioat/pci.c | 34 + + drivers/dma/ipu/ipu_irq.c | 14 +- + drivers/dma/pch_dma.c | 4 - + drivers/dma/pl330.c | 3 +- + drivers/dma/timb_dma.c | 4 - + drivers/dma/xgene-dma.c | 3 + + drivers/dma/zx296702_dma.c | 874 +++++++++++++++++++++ + drivers/gpu/ipu-v3/ipu-common.c | 4 +- + 20 files changed, 1100 insertions(+), 135 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/zxdma.txt + create mode 100644 drivers/dma/zx296702_dma.c +Merging net-next/master (c15df306fc79 ipv6: Remove unused arguments for __ipv6_dev_get_saddr().) +$ git merge net-next/master +Resolved 'net/bridge/br_mdb.c' using previous resolution. +Auto-merging net/sched/act_bpf.c +Auto-merging net/ipv6/datagram.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/core/rtnetlink.c +Auto-merging net/bridge/br_multicast.c +Auto-merging net/bridge/br_mdb.c +CONFLICT (content): Merge conflict in net/bridge/br_mdb.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 99aae01821b7] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/ip-sysctl.txt | 5 + + drivers/net/dsa/Kconfig | 6 +- + drivers/net/dsa/mv88e6352.c | 31 +- + drivers/net/dsa/mv88e6xxx.c | 42 +- + drivers/net/dsa/mv88e6xxx.h | 8 +- + drivers/net/ethernet/cadence/macb.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 54 ++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 94 ++-- + drivers/net/ethernet/chelsio/cxgb4/l2t.h | 18 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 89 ++-- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 - + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 18 + + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 12 +- + drivers/net/ethernet/ec_bhf.c | 14 +- + drivers/net/ethernet/emulex/benet/be.h | 2 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 64 ++- + drivers/net/ethernet/emulex/benet/be_cmds.h | 3 + + drivers/net/ethernet/emulex/benet/be_ethtool.c | 15 +- + drivers/net/ethernet/emulex/benet/be_main.c | 40 +- + drivers/net/ethernet/freescale/gianfar.c | 495 ++++++++++++--------- + drivers/net/ethernet/freescale/gianfar.h | 72 ++- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 4 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 1 - + drivers/net/ethernet/hisilicon/hip04_mdio.c | 1 - + drivers/net/ethernet/ibm/ibmveth.c | 145 ++++-- + drivers/net/ethernet/ibm/ibmveth.h | 18 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 24 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 24 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 + + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 30 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 51 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 + + drivers/net/ethernet/intel/i40e/i40e_type.h | 14 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 23 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 18 +- + drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 + + drivers/net/ethernet/intel/i40evf/i40e_type.h | 14 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 20 +- + drivers/net/ethernet/neterion/s2io.c | 26 +- + drivers/net/ethernet/neterion/s2io.h | 2 - + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 1 - + drivers/net/ethernet/renesas/ravb_main.c | 12 +- + drivers/net/ethernet/rocker/rocker.c | 76 +++- + drivers/net/ethernet/rocker/rocker.h | 1 + + drivers/net/ethernet/ti/netcp_core.c | 1 - + drivers/net/hyperv/hyperv_net.h | 1 + + drivers/net/hyperv/netvsc_drv.c | 61 ++- + drivers/net/hyperv/rndis_filter.c | 2 +- + drivers/net/ifb.c | 207 +++++---- + drivers/net/phy/marvell.c | 42 +- + drivers/net/phy/phy.c | 3 + + drivers/net/xen-netback/common.h | 3 - + include/linux/ipv6.h | 2 +- + include/linux/netdevice.h | 14 + + include/linux/phy.h | 2 + + include/net/act_api.h | 15 +- + include/net/inet_hashtables.h | 4 +- + include/net/inet_timewait_sock.h | 8 +- + include/net/netns/ipv6.h | 1 + + include/net/sch_generic.h | 31 +- + include/net/tc_act/tc_gact.h | 7 +- + include/net/tc_act/tc_mirred.h | 2 +- + include/net/tcp.h | 7 +- + include/net/timewait_sock.h | 3 - + include/uapi/linux/if_bridge.h | 1 + + include/uapi/linux/if_link.h | 1 + + kernel/bpf/core.c | 6 +- + lib/test_bpf.c | 6 + + net/bridge/br_mdb.c | 9 +- + net/bridge/br_multicast.c | 5 +- + net/bridge/br_private.h | 2 +- + net/core/dev.c | 24 +- + net/core/net-sysfs.c | 14 + + net/core/rtnetlink.c | 16 +- + net/core/timestamping.c | 6 +- + net/ipv4/inet_hashtables.c | 38 +- + net/ipv4/inet_timewait_sock.c | 55 +-- + net/ipv4/ip_fragment.c | 26 +- + net/ipv4/ping.c | 3 +- + net/ipv4/route.c | 3 +- + net/ipv4/tcp_bic.c | 2 +- + net/ipv4/tcp_cdg.c | 2 +- + net/ipv4/tcp_cong.c | 6 +- + net/ipv4/tcp_cubic.c | 4 +- + net/ipv4/tcp_highspeed.c | 2 +- + net/ipv4/tcp_htcp.c | 2 +- + net/ipv4/tcp_hybla.c | 2 +- + net/ipv4/tcp_illinois.c | 2 +- + net/ipv4/tcp_input.c | 62 +-- + net/ipv4/tcp_ipv4.c | 3 +- + net/ipv4/tcp_metrics.c | 2 +- + net/ipv4/tcp_minisocks.c | 6 +- + net/ipv4/tcp_output.c | 6 +- + net/ipv4/tcp_scalable.c | 2 +- + net/ipv4/tcp_timer.c | 1 - + net/ipv4/tcp_vegas.c | 6 +- + net/ipv4/tcp_veno.c | 2 +- + net/ipv6/Kconfig | 11 +- + net/ipv6/addrconf.c | 205 +++++---- + net/ipv6/af_inet6.c | 7 +- + net/ipv6/datagram.c | 8 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/inet6_hashtables.c | 9 +- + net/ipv6/raw.c | 3 +- + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/tcp_ipv6.c | 3 +- + net/netfilter/xt_TPROXY.c | 6 +- + net/sched/act_api.c | 44 +- + net/sched/act_bpf.c | 2 +- + net/sched/act_connmark.c | 3 +- + net/sched/act_csum.c | 3 +- + net/sched/act_gact.c | 44 +- + net/sched/act_ipt.c | 2 +- + net/sched/act_mirred.c | 58 +-- + net/sched/act_nat.c | 3 +- + net/sched/act_pedit.c | 3 +- + net/sched/act_simple.c | 3 +- + net/sched/act_skbedit.c | 3 +- + net/sched/act_vlan.c | 3 +- + net/sched/sch_qfq.c | 1 - + samples/bpf/bpf_helpers.h | 25 ++ + samples/bpf/tracex1_kern.c | 2 +- + samples/bpf/tracex2_kern.c | 6 +- + samples/bpf/tracex3_kern.c | 4 +- + samples/bpf/tracex4_kern.c | 6 +- + samples/bpf/tracex5_kern.c | 6 +- + 132 files changed, 1802 insertions(+), 1064 deletions(-) +Merging ipsec-next/master (493be55ac3d8 xen-netfront: Use setup_timer) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-drivers-next/master (8fc2b61a36fe ath9k: DFS - add pulse chirp detection for FCC) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath9k/dfs.c | 170 +++++++++++++++++++++++++++++++-- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + 2 files changed, 164 insertions(+), 8 deletions(-) +Merging bluetooth/master (95ee1d5db8d3 Bluetooth: hci_check_conn_params() check proper range) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/bfusb.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 2 +- + drivers/bluetooth/btintel.c | 80 ++++++ + drivers/bluetooth/btintel.h | 19 ++ + drivers/bluetooth/btusb.c | 91 +------ + drivers/bluetooth/dtl1_cs.c | 6 +- + drivers/bluetooth/hci_intel.c | 561 ++++++++++++++++++++++++++++++++++++++ + drivers/bluetooth/hci_ldisc.c | 6 + + drivers/bluetooth/hci_uart.h | 5 + + drivers/net/ieee802154/cc2520.c | 1 - + drivers/net/ieee802154/mrf24j40.c | 1 - + include/net/bluetooth/hci_core.h | 2 +- + include/net/bluetooth/l2cap.h | 2 + + include/net/cfg802154.h | 2 + + include/net/mac802154.h | 17 -- + net/6lowpan/iphc.c | 2 + + net/bluetooth/l2cap_sock.c | 41 ++- + net/ieee802154/rdev-ops.h | 20 ++ + net/ieee802154/sysfs.c | 38 +++ + net/ieee802154/trace.h | 22 ++ + net/mac802154/cfg.c | 54 +++- + net/mac802154/ieee802154_i.h | 7 +- + net/mac802154/iface.c | 14 +- + net/mac802154/main.c | 8 +- + net/mac802154/rx.c | 14 +- + net/mac802154/util.c | 8 + + 27 files changed, 888 insertions(+), 138 deletions(-) +Merging rdma/for-next (8e4349d13f33 IB/mad: Add final OPA MAD processing) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (5f867db63473 mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict) +$ git merge mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ++++++ + include/linux/mtd/nand.h | 10 +++++----- + 2 files changed, 11 insertions(+), 5 deletions(-) +Merging l2-mtd/master (906b1f536d5b Merge MTD 4.2-rc fixes into MTD -next) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/nandsim.c | 28 +++++++++------------------- + drivers/mtd/spi-nor/fsl-quadspi.c | 32 +++++++++++++++++++++++--------- + 2 files changed, 32 insertions(+), 28 deletions(-) +Merging crypto/master (b1ccc8f4b631 crypto: poly1305 - Add a four block AVX2 variant for x86_64) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + arch/arm/crypto/.gitignore | 2 + + arch/arm64/crypto/aes-ce-ccm-glue.c | 69 +- + arch/powerpc/include/asm/switch_to.h | 1 + + arch/powerpc/kernel/process.c | 3 - + arch/x86/crypto/Makefile | 6 + + arch/x86/crypto/aesni-intel_glue.c | 56 +- + arch/x86/crypto/chacha20-avx2-x86_64.S | 443 ++++ + arch/x86/crypto/chacha20-ssse3-x86_64.S | 625 +++++ + arch/x86/crypto/chacha20_glue.c | 150 ++ + arch/x86/crypto/poly1305-avx2-x86_64.S | 386 +++ + arch/x86/crypto/poly1305-sse2-x86_64.S | 582 +++++ + arch/x86/crypto/poly1305_glue.c | 207 ++ + crypto/Kconfig | 27 + + crypto/aead.c | 18 +- + crypto/algapi.c | 25 +- + crypto/ccm.c | 388 +-- + crypto/chacha20_generic.c | 28 +- + crypto/chacha20poly1305.c | 220 +- + crypto/cryptd.c | 23 +- + crypto/echainiv.c | 24 +- + crypto/gcm.c | 114 +- + crypto/pcrypt.c | 12 +- + crypto/poly1305_generic.c | 73 +- + crypto/rsa.c | 26 +- + crypto/seqiv.c | 34 +- + crypto/tcrypt.c | 89 +- + crypto/tcrypt.h | 20 + + crypto/testmgr.h | 2744 +++++++++++++++----- + drivers/crypto/caam/caamalg.c | 75 +- + drivers/crypto/ccp/ccp-platform.c | 2 + + drivers/crypto/marvell/cesa.c | 1 - + drivers/crypto/nx/nx-842-crypto.c | 48 +- + drivers/crypto/nx/nx-842-powernv.c | 10 +- + drivers/crypto/nx/nx-842-pseries.c | 22 +- + drivers/crypto/nx/nx-aes-ccm.c | 153 +- + drivers/crypto/nx/nx-aes-gcm.c | 66 +- + drivers/crypto/nx/nx.c | 21 +- + drivers/crypto/nx/nx.h | 6 +- + drivers/crypto/omap-aes.c | 86 +- + drivers/crypto/qat/Kconfig | 2 + + drivers/crypto/qat/qat_common/.gitignore | 1 + + drivers/crypto/qat/qat_common/Makefile | 5 + + drivers/crypto/qat/qat_common/adf_accel_devices.h | 3 + + drivers/crypto/qat/qat_common/adf_accel_engine.c | 42 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 12 +- + drivers/crypto/qat/qat_common/adf_init.c | 4 +- + drivers/crypto/qat/qat_common/icp_qat_fw.h | 2 + + drivers/crypto/qat/qat_common/icp_qat_fw_pke.h | 112 + + drivers/crypto/qat/qat_common/qat_algs.c | 5 - + drivers/crypto/qat/qat_common/qat_asym_algs.c | 639 +++++ + drivers/crypto/qat/qat_common/qat_crypto.c | 19 +- + drivers/crypto/qat/qat_common/qat_crypto.h | 2 - + drivers/crypto/qat/qat_common/qat_hal.c | 13 +- + drivers/crypto/qat/qat_common/qat_rsakey.asn1 | 5 + + drivers/crypto/qat/qat_common/qat_uclo.c | 27 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 7 + + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 3 + + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 12 - + drivers/crypto/vmx/aes.c | 3 + + drivers/crypto/vmx/aes_cbc.c | 3 + + drivers/crypto/vmx/aes_ctr.c | 3 + + drivers/crypto/vmx/ghash.c | 4 + + include/crypto/algapi.h | 3 +- + include/crypto/chacha20.h | 25 + + include/crypto/internal/aead.h | 36 + + include/crypto/poly1305.h | 41 + + 66 files changed, 6548 insertions(+), 1370 deletions(-) + create mode 100644 arch/x86/crypto/chacha20-avx2-x86_64.S + create mode 100644 arch/x86/crypto/chacha20-ssse3-x86_64.S + create mode 100644 arch/x86/crypto/chacha20_glue.c + create mode 100644 arch/x86/crypto/poly1305-avx2-x86_64.S + create mode 100644 arch/x86/crypto/poly1305-sse2-x86_64.S + create mode 100644 arch/x86/crypto/poly1305_glue.c + create mode 100644 drivers/crypto/qat/qat_common/.gitignore + create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_pke.h + create mode 100644 drivers/crypto/qat/qat_common/qat_asym_algs.c + create mode 100644 drivers/crypto/qat/qat_common/qat_rsakey.asn1 + create mode 100644 include/crypto/chacha20.h + create mode 100644 include/crypto/poly1305.h +Merging drm/drm-next (c5fd936e992d drm/nouveau: Pause between setting gpu to D3hot and cutting the power) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (4946b0430c69 drm/panel: simple: Add bus format for HannStar HSD100PXN1) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (4b0c8bb016e7 drm/i915/skl: Drop the preliminary_hw_support flag) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/drm_crtc.c +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 6 +- + arch/x86/configs/x86_64_defconfig | 1 - + drivers/char/agp/intel-gtt.c | 4 +- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/i915/Kconfig | 9 - + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/dvo_ivch.c | 63 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 6 +- + drivers/gpu/drm/i915/i915_debugfs.c | 281 +- + drivers/gpu/drm/i915/i915_dma.c | 32 +- + drivers/gpu/drm/i915/i915_drv.c | 50 +- + drivers/gpu/drm/i915/i915_drv.h | 244 +- + drivers/gpu/drm/i915/i915_gem.c | 415 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 93 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 160 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 732 ++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 64 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 15 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 171 +- + drivers/gpu/drm/i915/i915_ioc32.c | 138 +- + drivers/gpu/drm/i915/i915_irq.c | 504 +--- + drivers/gpu/drm/i915/i915_params.c | 15 +- + drivers/gpu/drm/i915/i915_reg.h | 138 +- + drivers/gpu/drm/i915/i915_suspend.c | 2 +- + drivers/gpu/drm/i915/i915_sysfs.c | 22 +- + drivers/gpu/drm/i915/i915_trace.h | 16 +- + drivers/gpu/drm/i915/intel_atomic.c | 249 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 41 +- + drivers/gpu/drm/i915/intel_audio.c | 3 +- + drivers/gpu/drm/i915/intel_bios.c | 62 +- + drivers/gpu/drm/i915/intel_csr.c | 6 +- + drivers/gpu/drm/i915/intel_ddi.c | 1100 ++++--- + drivers/gpu/drm/i915/intel_display.c | 4093 ++++++++++++++------------ + drivers/gpu/drm/i915/intel_dp.c | 254 +- + drivers/gpu/drm/i915/intel_drv.h | 151 +- + drivers/gpu/drm/i915/intel_dsi.c | 12 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 97 +- + drivers/gpu/drm/i915/intel_fbc.c | 535 +++- + drivers/gpu/drm/i915/intel_fbdev.c | 49 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 115 +- + drivers/gpu/drm/i915/intel_hdmi.c | 423 ++- + drivers/gpu/drm/i915/intel_hotplug.c | 499 ++++ + drivers/gpu/drm/i915/intel_lrc.c | 882 ++++-- + drivers/gpu/drm/i915/intel_lrc.h | 21 +- + drivers/gpu/drm/i915/intel_lvds.c | 72 +- + drivers/gpu/drm/i915/intel_mocs.c | 335 +++ + drivers/gpu/drm/i915/intel_mocs.h | 57 + + drivers/gpu/drm/i915/intel_opregion.c | 104 +- + drivers/gpu/drm/i915/intel_overlay.c | 63 +- + drivers/gpu/drm/i915/intel_pm.c | 825 ++++-- + drivers/gpu/drm/i915/intel_psr.c | 78 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 390 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 92 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 83 +- + drivers/gpu/drm/i915/intel_sprite.c | 205 +- + drivers/gpu/drm/i915/intel_uncore.c | 74 +- + include/drm/intel-gtt.h | 4 +- + include/uapi/drm/i915_drm.h | 16 +- + 59 files changed, 8480 insertions(+), 5699 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_hotplug.c + create mode 100644 drivers/gpu/drm/i915/intel_mocs.c + create mode 100644 drivers/gpu/drm/i915/intel_mocs.h +Merging drm-tegra/drm/tegra/for-next (8a8005e3e199 drm/tegra: dpaux: Registers are 32-bit) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (f9fe4b9b2ad4 drm/mgag200: remove unneeded variable) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c +Auto-merging drivers/gpu/drm/drm_ioc32.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_atomic.c | 76 ++++++++++++++++------------------ + drivers/gpu/drm/drm_atomic_helper.c | 14 ++++--- + drivers/gpu/drm/drm_context.c | 51 ++++++++++++++++++++++- + drivers/gpu/drm/drm_crtc.c | 9 +--- + drivers/gpu/drm/drm_crtc_helper.c | 24 +++++------ + drivers/gpu/drm/drm_drv.c | 7 +--- + drivers/gpu/drm/drm_fb_helper.c | 26 ------------ + drivers/gpu/drm/drm_gem.c | 11 +---- + drivers/gpu/drm/drm_ioc32.c | 55 ++++++++++++------------ + drivers/gpu/drm/drm_irq.c | 2 +- + drivers/gpu/drm/drm_legacy.h | 2 +- + drivers/gpu/drm/drm_lock.c | 6 +++ + drivers/gpu/drm/drm_plane_helper.c | 16 ++++--- + drivers/gpu/drm/mgag200/mgag200_fb.c | 2 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++-- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 8 +--- + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- + include/drm/drmP.h | 23 +++++----- + include/uapi/drm/drm_fourcc.h | 7 ++++ + 19 files changed, 178 insertions(+), 173 deletions(-) +Merging drm-exynos/exynos-drm/for-next (8b1d758b47cd drm/exynos: move order to register vidi kms driver) +$ git merge drm-exynos/exynos-drm/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 14 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.c | 20 +- + drivers/gpu/drm/exynos/exynos_drm_iommu.h | 15 - + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 16 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 867 ++++++++------------------ + drivers/gpu/drm/exynos/exynos_mixer.c | 86 ++- + 12 files changed, 327 insertions(+), 742 deletions(-) +Merging drm-msm/msm-next (1a370be9ac51 drm/msm: restart queued submits after hang) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (fbce23a0b957 ALSA: hda - Check the return value from pm_runtime_get/put*()) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + include/sound/hdaudio.h | 16 ++++++++-------- + sound/aoa/codecs/onyx.c | 1 - + sound/aoa/codecs/tas.c | 1 - + sound/hda/hdac_device.c | 26 ++++++++++++++++++-------- + sound/hda/hdac_regmap.c | 10 ++++++---- + sound/hda/hdac_sysfs.c | 3 +-- + sound/pci/emu10k1/emumixer.c | 25 ++++++++++++++----------- + sound/pci/hda/hda_codec.c | 2 +- + 8 files changed, 48 insertions(+), 36 deletions(-) +Merging sound-asoc/for-next (c2cfef1c7daf Merge remote-tracking branches 'asoc/topic/wm8904' and 'asoc/topic/wm8996' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/cs4349.txt | 19 + + .../devicetree/bindings/sound/max98357a.txt | 6 +- + .../devicetree/bindings/sound/mt8173-max98090.txt | 2 + + .../bindings/sound/mt8173-rt5650-rt5676.txt | 2 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 22 + + .../bindings/sound/renesas,rsrc-card.txt | 7 + + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 155 +++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/base/regmap/internal.h | 2 +- + drivers/base/regmap/regmap.c | 73 +- + drivers/gpu/drm/i2c/adv7511.c | 2 +- + drivers/input/misc/drv260x.c | 6 +- + drivers/input/misc/drv2665.c | 2 +- + drivers/input/misc/drv2667.c | 4 +- + drivers/mfd/arizona-core.c | 2 +- + drivers/mfd/twl6040.c | 2 +- + drivers/mfd/wm5102-tables.c | 6 +- + drivers/mfd/wm5110-tables.c | 22 +- + drivers/mfd/wm8994-core.c | 8 +- + drivers/mfd/wm8997-tables.c | 2 +- + include/linux/mfd/arizona/registers.h | 37 + + include/linux/regmap.h | 28 +- + include/sound/rcar_snd.h | 14 + + include/sound/rt298.h | 20 + + include/sound/soc.h | 15 +- + include/uapi/sound/asoc.h | 6 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/88pm860x-codec.c | 4 +- + sound/soc/codecs/Kconfig | 21 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/adau1373.c | 1 - + sound/soc/codecs/adau1701.c | 1 - + sound/soc/codecs/adau1761-i2c.c | 1 - + sound/soc/codecs/adau1781-i2c.c | 1 - + sound/soc/codecs/adau1977-i2c.c | 1 - + sound/soc/codecs/adav803.c | 1 - + sound/soc/codecs/adav80x.c | 2 +- + sound/soc/codecs/ak4535.c | 1 - + sound/soc/codecs/ak4641.c | 1 - + sound/soc/codecs/ak4642.c | 34 +- + sound/soc/codecs/ak4671.c | 1 - + sound/soc/codecs/alc5623.c | 1 - + sound/soc/codecs/alc5632.c | 3 +- + sound/soc/codecs/arizona.c | 80 +- + sound/soc/codecs/arizona.h | 19 + + sound/soc/codecs/cs35l32.c | 3 +- + sound/soc/codecs/cs4265.c | 1 - + sound/soc/codecs/cs4270.c | 1 - + sound/soc/codecs/cs4271-i2c.c | 1 - + sound/soc/codecs/cs42l51-i2c.c | 1 - + sound/soc/codecs/cs42l52.c | 5 +- + sound/soc/codecs/cs42l56.c | 3 +- + sound/soc/codecs/cs42l73.c | 1 - + sound/soc/codecs/cs42xx8-i2c.c | 4 +- + sound/soc/codecs/cs42xx8.c | 19 +- + sound/soc/codecs/cs42xx8.h | 1 + + sound/soc/codecs/cs4349.c | 401 ++++++ + sound/soc/codecs/cs4349.h | 146 +++ + sound/soc/codecs/da7210.c | 7 +- + sound/soc/codecs/da7213.c | 3 +- + sound/soc/codecs/da732x.c | 15 +- + sound/soc/codecs/da9055.c | 3 +- + sound/soc/codecs/gtm601.c | 95 ++ + sound/soc/codecs/isabelle.c | 11 +- + sound/soc/codecs/lm4857.c | 1 - + sound/soc/codecs/lm49453.c | 19 +- + sound/soc/codecs/max9768.c | 64 +- + sound/soc/codecs/max98088.c | 1 - + sound/soc/codecs/max98088.h | 2 +- + sound/soc/codecs/max98090.c | 12 +- + sound/soc/codecs/max98095.c | 10 +- + sound/soc/codecs/max98357a.c | 25 +- + sound/soc/codecs/max9850.c | 1 - + sound/soc/codecs/max9877.c | 19 +- + sound/soc/codecs/max98925.c | 2 - + sound/soc/codecs/mc13783.c | 6 +- + sound/soc/codecs/ml26124.c | 3 +- + sound/soc/codecs/pcm1681.c | 1 - + sound/soc/codecs/pcm512x-i2c.c | 1 - + sound/soc/codecs/rt286.c | 11 +- + sound/soc/codecs/rt298.c | 1271 ++++++++++++++++++++ + sound/soc/codecs/rt298.h | 206 ++++ + sound/soc/codecs/rt5631.c | 1 - + sound/soc/codecs/rt5640.c | 5 +- + sound/soc/codecs/rt5645.c | 273 +++-- + sound/soc/codecs/rt5645.h | 26 - + sound/soc/codecs/rt5651.c | 5 +- + sound/soc/codecs/rt5670.c | 7 +- + sound/soc/codecs/rt5677.c | 149 +-- + sound/soc/codecs/rt5677.h | 5 +- + sound/soc/codecs/sgtl5000.c | 1 - + sound/soc/codecs/si476x.c | 2 +- + sound/soc/codecs/sirf-audio-codec.c | 4 +- + sound/soc/codecs/ssm2518.c | 1 - + sound/soc/codecs/ssm2602-i2c.c | 1 - + sound/soc/codecs/ssm4567.c | 1 - + sound/soc/codecs/sta32x.c | 1 - + sound/soc/codecs/sta350.c | 1 - + sound/soc/codecs/sta529.c | 1 - + sound/soc/codecs/sti-sas.c | 628 ++++++++++ + sound/soc/codecs/tas2552.c | 5 +- + sound/soc/codecs/tas5086.c | 1 - + sound/soc/codecs/tas571x.c | 2 +- + sound/soc/codecs/tfa9879.c | 3 +- + sound/soc/codecs/tlv320aic31xx.c | 3 +- + sound/soc/codecs/tlv320aic32x4.c | 1 - + sound/soc/codecs/tlv320aic3x.c | 3 +- + sound/soc/codecs/tlv320dac33.c | 1 - + sound/soc/codecs/tpa6130a2.c | 1 - + sound/soc/codecs/ts3a227e.c | 48 +- + sound/soc/codecs/uda134x.c | 180 ++- + sound/soc/codecs/uda134x.h | 2 - + sound/soc/codecs/uda1380.c | 1 - + sound/soc/codecs/wm0010.c | 3 +- + sound/soc/codecs/wm1250-ev1.c | 1 - + sound/soc/codecs/wm2000.c | 1 - + sound/soc/codecs/wm2200.c | 7 +- + sound/soc/codecs/wm5100.c | 11 +- + sound/soc/codecs/wm5102.c | 27 +- + sound/soc/codecs/wm5110.c | 315 ++++- + sound/soc/codecs/wm8510.c | 1 - + sound/soc/codecs/wm8523.c | 1 - + sound/soc/codecs/wm8580.c | 1 - + sound/soc/codecs/wm8711.c | 1 - + sound/soc/codecs/wm8728.c | 1 - + sound/soc/codecs/wm8731.c | 82 +- + sound/soc/codecs/wm8737.c | 1 - + sound/soc/codecs/wm8741.c | 1 - + sound/soc/codecs/wm8750.c | 1 - + sound/soc/codecs/wm8753.c | 1 - + sound/soc/codecs/wm8776.c | 1 - + sound/soc/codecs/wm8804-i2c.c | 1 - + sound/soc/codecs/wm8900.c | 1 - + sound/soc/codecs/wm8903.c | 1 - + sound/soc/codecs/wm8904.c | 5 +- + sound/soc/codecs/wm8940.c | 1 - + sound/soc/codecs/wm8955.c | 1 - + sound/soc/codecs/wm8960.c | 1 - + sound/soc/codecs/wm8961.c | 1 - + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/codecs/wm8971.c | 1 - + sound/soc/codecs/wm8974.c | 1 - + sound/soc/codecs/wm8978.c | 1 - + sound/soc/codecs/wm8983.c | 1 - + sound/soc/codecs/wm8985.c | 1 - + sound/soc/codecs/wm8988.c | 1 - + sound/soc/codecs/wm8990.c | 1 - + sound/soc/codecs/wm8991.c | 1 - + sound/soc/codecs/wm8993.c | 5 +- + sound/soc/codecs/wm8995.c | 1 - + sound/soc/codecs/wm8996.c | 9 +- + sound/soc/codecs/wm8997.c | 20 +- + sound/soc/codecs/wm9081.c | 3 +- + sound/soc/codecs/wm9090.c | 1 - + sound/soc/fsl/fsl_asrc.c | 25 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/fsl/fsl_spdif.c | 19 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-pcm-dma.c | 25 +- + sound/soc/fsl/imx-pcm.h | 9 +- + sound/soc/fsl/imx-ssi.c | 2 +- + sound/soc/generic/simple-card.c | 9 + + sound/soc/intel/Kconfig | 29 +- + sound/soc/intel/Makefile | 3 +- + sound/soc/intel/atom/sst-atom-controls.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 - + sound/soc/intel/atom/sst-mfld-platform.h | 1 + + sound/soc/intel/atom/sst/sst_drv_interface.c | 14 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 22 +- + sound/soc/intel/common/sst-dsp-priv.h | 23 +- + sound/soc/intel/common/sst-dsp.c | 71 ++ + sound/soc/intel/common/sst-dsp.h | 6 + + sound/soc/intel/skylake/Makefile | 9 + + sound/soc/intel/skylake/skl-pcm.c | 916 ++++++++++++++ + sound/soc/intel/skylake/skl-sst-cldma.c | 327 +++++ + sound/soc/intel/skylake/skl-sst-cldma.h | 251 ++++ + sound/soc/intel/skylake/skl-sst-dsp.c | 342 ++++++ + sound/soc/intel/skylake/skl-sst-dsp.h | 145 +++ + sound/soc/intel/skylake/skl-sst-ipc.c | 771 ++++++++++++ + sound/soc/intel/skylake/skl-sst-ipc.h | 125 ++ + sound/soc/intel/skylake/skl-sst.c | 280 +++++ + sound/soc/intel/skylake/skl.c | 536 +++++++++ + sound/soc/intel/skylake/skl.h | 71 ++ + sound/soc/mediatek/mt8173-max98090.c | 18 +- + sound/soc/mediatek/mt8173-rt5650-rt5676.c | 20 +- + sound/soc/mediatek/mtk-afe-pcm.c | 3 +- + sound/soc/omap/omap3pandora.c | 6 +- + sound/soc/qcom/Kconfig | 7 +- + sound/soc/sh/fsi.c | 1 - + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/core.c | 194 ++- + sound/soc/sh/rcar/ctu.c | 171 +++ + sound/soc/sh/rcar/dma.c | 126 +- + sound/soc/sh/rcar/dvc.c | 73 +- + sound/soc/sh/rcar/gen.c | 33 +- + sound/soc/sh/rcar/mix.c | 200 +++ + sound/soc/sh/rcar/rsnd.h | 111 +- + sound/soc/sh/rcar/rsrc-card.c | 22 +- + sound/soc/sh/rcar/src.c | 117 +- + sound/soc/sh/rcar/ssi.c | 4 +- + sound/soc/soc-core.c | 74 +- + sound/soc/soc-dapm.c | 43 +- + sound/soc/soc-pcm.c | 5 + + sound/soc/soc-topology.c | 24 +- + sound/soc/sti/Kconfig | 11 + + sound/soc/sti/Makefile | 4 + + sound/soc/sti/sti_uniperif.c | 253 ++++ + sound/soc/sti/uniperif.h | 1229 +++++++++++++++++++ + sound/soc/sti/uniperif_player.c | 1041 ++++++++++++++++ + sound/soc/sti/uniperif_reader.c | 362 ++++++ + sound/soc/zte/zx296702-i2s.c | 4 +- + sound/soc/zte/zx296702-spdif.c | 4 +- + 214 files changed, 12010 insertions(+), 1104 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cs4349.txt + create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt + create mode 100644 include/sound/rt298.h + create mode 100644 sound/soc/codecs/cs4349.c + create mode 100644 sound/soc/codecs/cs4349.h + create mode 100644 sound/soc/codecs/gtm601.c + create mode 100644 sound/soc/codecs/rt298.c + create mode 100644 sound/soc/codecs/rt298.h + create mode 100644 sound/soc/codecs/sti-sas.c + create mode 100644 sound/soc/intel/skylake/Makefile + create mode 100644 sound/soc/intel/skylake/skl-pcm.c + create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c + create mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h + create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c + create mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h + create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c + create mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h + create mode 100644 sound/soc/intel/skylake/skl-sst.c + create mode 100644 sound/soc/intel/skylake/skl.c + create mode 100644 sound/soc/intel/skylake/skl.h + create mode 100644 sound/soc/sh/rcar/ctu.c + create mode 100644 sound/soc/sh/rcar/mix.c + create mode 100644 sound/soc/sti/Kconfig + create mode 100644 sound/soc/sti/Makefile + create mode 100644 sound/soc/sti/sti_uniperif.c + create mode 100644 sound/soc/sti/uniperif.h + create mode 100644 sound/soc/sti/uniperif_player.c + create mode 100644 sound/soc/sti/uniperif_reader.c +Merging modules/modules-next (20bdc2cfdbc4 modules: only use mod->param_lock if CONFIG_MODULES) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (800e3b9a6801 Input: drop owner assignment from i2c_driver) +$ git merge input/next +Auto-merging include/linux/platform_data/pixcir_i2c_ts.h +Auto-merging drivers/input/touchscreen/zforce_ts.c +Auto-merging drivers/input/touchscreen/pixcir_i2c_ts.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/mouse/elan_i2c_core.c +Auto-merging drivers/input/misc/drv2667.c +Auto-merging drivers/input/misc/drv2665.c +Auto-merging drivers/input/misc/drv260x.c +Auto-merging drivers/input/joydev.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 3 + + Documentation/kernel-parameters.txt | 4 + + drivers/input/ff-core.c | 5 +- + drivers/input/joydev.c | 11 +- + drivers/input/keyboard/adp5589-keys.c | 1 - + drivers/input/keyboard/cap11xx.c | 1 - + drivers/input/keyboard/lm8333.c | 1 - + drivers/input/keyboard/mcs_touchkey.c | 1 - + drivers/input/keyboard/mpr121_touchkey.c | 1 - + drivers/input/keyboard/qt1070.c | 1 - + drivers/input/keyboard/qt2160.c | 1 - + drivers/input/keyboard/tca8418_keypad.c | 1 - + drivers/input/misc/adxl34x-i2c.c | 1 - + drivers/input/misc/bma150.c | 8 +- + drivers/input/misc/cma3000_d0x_i2c.c | 1 - + drivers/input/misc/drv260x.c | 3 +- + drivers/input/misc/drv2665.c | 3 +- + drivers/input/misc/drv2667.c | 3 +- + drivers/input/misc/gp2ap002a00f.c | 1 - + drivers/input/misc/kxtj9.c | 1 - + drivers/input/misc/mpu3050.c | 1 - + drivers/input/misc/pcf8574_keypad.c | 1 - + drivers/input/misc/uinput.c | 6 +- + drivers/input/mouse/cyapa.c | 1 - + drivers/input/mouse/elan_i2c_core.c | 1 - + drivers/input/mouse/synaptics_i2c.c | 1 - + drivers/input/serio/ambakmi.c | 8 +- + drivers/input/serio/i8042.c | 43 +++++- + drivers/input/serio/i8042.h | 13 ++ + drivers/input/serio/serio.c | 5 +- + drivers/input/touchscreen/Kconfig | 4 +- + drivers/input/touchscreen/Makefile | 2 +- + drivers/input/touchscreen/ad7879-i2c.c | 1 - + drivers/input/touchscreen/ar1021_i2c.c | 1 - + drivers/input/touchscreen/atmel_mxt_ts.c | 1 - + drivers/input/touchscreen/auo-pixcir-ts.c | 1 - + drivers/input/touchscreen/bu21013_ts.c | 1 - + drivers/input/touchscreen/chipone_icn8318.c | 1 - + drivers/input/touchscreen/cy8ctmg110_ts.c | 1 - + drivers/input/touchscreen/cyttsp4_i2c.c | 1 - + drivers/input/touchscreen/cyttsp_i2c.c | 1 - + drivers/input/touchscreen/edt-ft5x06.c | 3 +- + drivers/input/touchscreen/egalax_ts.c | 1 - + drivers/input/touchscreen/elants_i2c.c | 1 - + drivers/input/touchscreen/goodix.c | 1 - + drivers/input/touchscreen/ili210x.c | 1 - + drivers/input/touchscreen/max11801_ts.c | 1 - + drivers/input/touchscreen/mms114.c | 1 - + drivers/input/touchscreen/of_touchscreen.c | 68 +++++----- + drivers/input/touchscreen/pixcir_i2c_ts.c | 147 +++++++++++---------- + drivers/input/touchscreen/st1232.c | 1 - + drivers/input/touchscreen/tsc2005.c | 2 +- + drivers/input/touchscreen/tsc2007.c | 1 - + drivers/input/touchscreen/wacom_i2c.c | 1 - + drivers/input/touchscreen/wdt87xx_i2c.c | 49 ++++++- + drivers/input/touchscreen/zforce_ts.c | 59 +++++---- + include/linux/input/touchscreen.h | 11 +- + .../pixcir_ts.h => platform_data/pixcir_i2c_ts.h} | 1 - + include/linux/platform_data/zforce_ts.h | 3 - + include/linux/serio.h | 2 + + 60 files changed, 276 insertions(+), 225 deletions(-) + rename include/linux/{input/pixcir_ts.h => platform_data/pixcir_i2c_ts.h} (96%) +Merging block/for-next (d45a0f150e9d block: make /sys/block/<dev>/queue/discard_max_bytes writeable) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + Documentation/block/queue-sysfs.txt | 10 +++++++++- + block/blk-settings.c | 4 ++++ + block/blk-sysfs.c | 40 ++++++++++++++++++++++++++++++++++++- + block/genhd.c | 9 ++++++--- + block/partition-generic.c | 12 +++++------ + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_nl.c | 4 ++-- + drivers/block/loop.c | 4 ++-- + drivers/block/nbd.c | 2 +- + drivers/block/nvme-core.c | 2 +- + drivers/block/rbd.c | 2 +- + drivers/block/skd_main.c | 2 +- + drivers/block/zram/zram_drv.c | 2 +- + drivers/md/bcache/super.c | 2 +- + drivers/mmc/card/queue.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/scsi/sd.c | 4 ++-- + include/linux/blkdev.h | 1 + + include/linux/genhd.h | 33 ++++++++++++++++++++---------- + 19 files changed, 103 insertions(+), 36 deletions(-) +Merging device-mapper/for-next (665022d72f9b dm cache: avoid calls to prealloc_free_structs() if possible) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (bc0195aad0da Linux 4.2-rc2) +$ git merge mmc-uh/next +Already up-to-date. +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (195c018eefad Fix read-balancing during node failure) +$ git merge md/for-next +Auto-merging drivers/md/bitmap.c +Merge made by the 'recursive' strategy. + drivers/md/bitmap.c | 11 ++++------- + drivers/md/md-cluster.c | 12 +++++++++++- + drivers/md/md-cluster.h | 2 +- + drivers/md/raid1.c | 7 ++++--- + lib/raid6/neon.c | 13 ++++++++++++- + lib/raid6/neon.uc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 78 insertions(+), 13 deletions(-) +Merging mfd/for-mfd-next (46a0c045e80c mfd: wm8994-regmap: Constify reg_default tables) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/arizona/registers.h +Auto-merging drivers/mfd/wm8997-tables.c +Auto-merging drivers/mfd/wm5110-tables.c +Auto-merging drivers/mfd/wm5102-tables.c +Auto-merging drivers/mfd/arizona-core.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/da9062.txt | 79 ++ + drivers/mfd/Kconfig | 20 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/arizona-core.c | 107 +- + drivers/mfd/arizona-i2c.c | 8 + + drivers/mfd/arizona-irq.c | 9 + + drivers/mfd/arizona.h | 5 + + drivers/mfd/da9062-core.c | 512 +++++++ + drivers/mfd/intel_soc_pmic_core.c | 2 +- + drivers/mfd/t7l66xb.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/wm5102-tables.c | 47 +- + drivers/mfd/wm5110-tables.c | 10 - + drivers/mfd/wm8994-regmap.c | 6 +- + drivers/mfd/wm8997-tables.c | 6 +- + drivers/mfd/wm8998-tables.c | 1592 ++++++++++++++++++++++ + include/linux/mfd/88pm80x.h | 162 +-- + include/linux/mfd/arizona/core.h | 3 + + include/linux/mfd/arizona/pdata.h | 14 +- + include/linux/mfd/arizona/registers.h | 220 +++ + include/linux/mfd/da9062/core.h | 50 + + include/linux/mfd/da9062/registers.h | 1108 +++++++++++++++ + 22 files changed, 3809 insertions(+), 165 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/da9062.txt + create mode 100644 drivers/mfd/da9062-core.c + create mode 100644 drivers/mfd/wm8998-tables.c + create mode 100644 include/linux/mfd/da9062/core.h + create mode 100644 include/linux/mfd/da9062/registers.h +Merging backlight/for-backlight-next (cca0ba2df3d4 backlight: Change the return type of backlight_update_status() to int) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (b1a55af2773d power_supply: Drop owner assignment from i2c_driver) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/bq24190_charger.c | 1 - + drivers/power/bq24735-charger.c | 1 - + drivers/power/pm2301_charger.c | 1 - + drivers/power/rt9455_charger.c | 16 ++++++++++++++-- + 4 files changed, 14 insertions(+), 5 deletions(-) +Merging omap_dss2/for-next (f778dad38a54 Merge omapdss scaling fixes) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (c205a8cd5b76 Merge remote-tracking branches 'regulator/topic/qcom-spmi' and 'regulator/topic/stub' into regulator-next) +$ git merge regulator/for-next +Removing drivers/regulator/max77843.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/da9210.txt | 4 + + .../devicetree/bindings/regulator/da9211.txt | 32 ++- + .../bindings/regulator/max8973-regulator.txt | 6 + + .../bindings/regulator/pwm-regulator.txt | 65 ++++-- + drivers/extcon/extcon-max77693.c | 94 ++++----- + drivers/extcon/extcon-max77843.c | 66 +++--- + drivers/input/misc/max77693-haptic.c | 1 + + drivers/input/misc/max77843-haptic.c | 3 +- + drivers/leds/leds-max77693.c | 1 + + drivers/mfd/max77693.c | 31 +-- + drivers/mfd/max77843.c | 20 +- + drivers/power/max77693_charger.c | 1 + + drivers/regulator/88pm800.c | 234 +++++++-------------- + drivers/regulator/Kconfig | 22 +- + drivers/regulator/Makefile | 1 - + drivers/regulator/act8865-regulator.c | 1 - + drivers/regulator/core.c | 33 ++- + drivers/regulator/da9062-regulator.c | 1 - + drivers/regulator/da9210-regulator.c | 76 ++++++- + drivers/regulator/da9211-regulator.c | 41 ++-- + drivers/regulator/da9211-regulator.h | 18 +- + drivers/regulator/isl6271a-regulator.c | 1 - + drivers/regulator/isl9305.c | 1 - + drivers/regulator/lp3971.c | 1 - + drivers/regulator/lp3972.c | 1 - + drivers/regulator/lp872x.c | 1 - + drivers/regulator/ltc3589.c | 3 +- + drivers/regulator/max1586.c | 1 - + drivers/regulator/max77693.c | 161 ++++++++++++-- + drivers/regulator/max77843.c | 201 ------------------ + drivers/regulator/max8660.c | 1 - + drivers/regulator/max8973-regulator.c | 74 ++++++- + drivers/regulator/pfuze100-regulator.c | 1 - + drivers/regulator/pwm-regulator.c | 160 ++++++++++---- + drivers/regulator/qcom_spmi-regulator.c | 3 +- + drivers/regulator/s2mps11.c | 14 +- + drivers/regulator/tps51632-regulator.c | 1 - + drivers/regulator/tps62360-regulator.c | 1 - + drivers/regulator/tps65023-regulator.c | 1 - + include/linux/mfd/max77693-common.h | 49 +++++ + include/linux/mfd/max77693-private.h | 134 +++++------- + include/linux/mfd/max77843-private.h | 174 +++++++-------- + include/linux/regulator/consumer.h | 6 + + include/linux/regulator/da9211.h | 19 +- + 44 files changed, 976 insertions(+), 784 deletions(-) + delete mode 100644 drivers/regulator/max77843.c + create mode 100644 include/linux/mfd/max77693-common.h +Merging security/next (b3bddffd35a0 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (24fd03c87695 ima: update builtin policies) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (fda4d578ed0a selinux: explicitly declare the role "base_r") +$ git merge selinux/next +Auto-merging security/selinux/include/avc.h +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/avc.c +Auto-merging security/lsm_audit.c +Merge made by the 'recursive' strategy. + include/linux/lsm_audit.h | 7 + + scripts/selinux/mdp/mdp.c | 1 + + security/lsm_audit.c | 15 ++ + security/selinux/avc.c | 418 ++++++++++++++++++++++++++++++++++-- + security/selinux/hooks.c | 147 ++++++++----- + security/selinux/include/avc.h | 6 + + security/selinux/include/security.h | 32 ++- + security/selinux/ss/avtab.c | 104 +++++++-- + security/selinux/ss/avtab.h | 33 ++- + security/selinux/ss/conditional.c | 32 ++- + security/selinux/ss/conditional.h | 6 +- + security/selinux/ss/policydb.c | 5 + + security/selinux/ss/services.c | 213 ++++++++++++++++-- + security/selinux/ss/services.h | 6 + + 14 files changed, 915 insertions(+), 110 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (1c4c7159ed24 Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (5e92946c39ca iommu/arm-smmu: Skip the execution of CMD_PREFETCH_CONFIG) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/arm,smmu-v3.txt | 3 ++ + drivers/iommu/arm-smmu-v3.c | 60 +++++++++++++++++----- + 2 files changed, 49 insertions(+), 14 deletions(-) +Merging dwmw2-iommu/master (c83b2f20fdde iommu/vt-d: Only enable extended context tables if PASID is supported) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (0098f75bf729 Merge branch 'doc/4.3-reproducible' into docs-next) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/CodingStyle | 2 - + Documentation/DocBook/Makefile | 14 +- + Documentation/DocBook/device-drivers.tmpl | 6 + + Documentation/DocBook/gadget.tmpl | 3 + + Documentation/DocBook/kernel-api.tmpl | 6 + + Documentation/DocBook/media/dvb/intro.xml | 4 +- + Documentation/DocBook/stylesheet.xsl | 1 + + Documentation/SubmittingPatches | 8 +- + Documentation/arm/Samsung/Bootloader-interface.txt | 15 +- + Documentation/email-clients.txt | 2 +- + Documentation/filesystems/btrfs.txt | 16 +- + Documentation/filesystems/debugfs.txt | 40 +++++ + Documentation/kernel-doc-nano-HOWTO.txt | 2 +- + Documentation/men-chameleon-bus.txt | 162 +++++++++++++++++++++ + Documentation/networking/can.txt | 4 +- + Documentation/powerpc/cxl.txt | 2 +- + Documentation/powerpc/dscr.txt | 6 +- + Documentation/powerpc/qe_firmware.txt | 2 +- + Documentation/pps/pps.txt | 2 +- + Documentation/sysctl/vm.txt | 10 +- + MAINTAINERS | 1 + + README | 2 +- + scripts/kernel-doc | 17 ++- + 23 files changed, 287 insertions(+), 40 deletions(-) + create mode 100644 Documentation/men-chameleon-bus.txt +Merging trivial/for-next (79ce48df755e lpfc: Grammar s/an negative/a negative/) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (0b08c5e59441 audit: Fix check of return value of strnlen_user()) +$ git merge audit/next +Already up-to-date. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (0b34c1a489f6 Documentation: DT: Fix a typo in the filename "lantiq,<chip>-pinumx.txt") +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (7d641938aa2a mailbox/bcm2835: Fix mailbox full detection.) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (3f297519be4c Merge remote-tracking branches 'spi/topic/stats' and 'spi/topic/xcomm' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../bindings/powerpc/fsl/mpc5121-psc.txt | 24 ++- + .../devicetree/bindings/spi/spi-img-spfi.txt | 1 + + arch/powerpc/include/asm/mpc52xx_psc.h | 5 +- + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-img-spfi.c | 16 ++ + drivers/spi/spi-mpc512x-psc.c | 70 +++++--- + drivers/spi/spi-pxa2xx-pci.c | 1 - + drivers/spi/spi-rockchip.c | 1 - + drivers/spi/spi-rspi.c | 19 ++- + drivers/spi/spi-s3c24xx.c | 1 - + drivers/spi/spi-sh-msiof.c | 5 - + drivers/spi/spi-xcomm.c | 1 - + drivers/spi/spi-zynqmp-gqspi.c | 1 + + drivers/spi/spi.c | 184 ++++++++++++++++++++- + drivers/spi/spidev.c | 3 +- + include/linux/spi/spi.h | 64 +++++++ + 16 files changed, 342 insertions(+), 56 deletions(-) +Merging tip/auto-latest (b5d1257ddefe Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging drivers/irqchip/spear-shirq.c +Auto-merging drivers/irqchip/irq-mips-gic.c +Auto-merging drivers/cpufreq/intel_pstate.c +Auto-merging arch/x86/platform/intel/iosf_mbi.c +Auto-merging arch/x86/platform/atom/pmc_atom.c +Removing arch/x86/include/asm/context_tracking.h +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + arch/ia64/kernel/msi_ia64.c | 2 +- + arch/ia64/sn/kernel/msi_sn.c | 2 +- + arch/powerpc/sysdev/xics/ics-opal.c | 2 +- + arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- + arch/tile/kernel/pci_gx.c | 2 +- + arch/um/include/shared/kern_util.h | 3 +- + arch/um/kernel/process.c | 6 +- + arch/um/kernel/signal.c | 8 +- + arch/um/kernel/tlb.c | 2 +- + arch/um/kernel/trap.c | 2 +- + arch/x86/Kconfig | 7 +- + arch/x86/boot/compressed/aslr.c | 2 +- + arch/x86/boot/compressed/misc.c | 24 ++ + arch/x86/boot/compressed/misc.h | 11 + + arch/x86/entry/Makefile | 1 + + arch/x86/entry/calling.h | 9 - + arch/x86/entry/common.c | 375 +++++++++++++++++++++ + arch/x86/entry/entry_64.S | 197 +++-------- + arch/x86/entry/entry_64_compat.S | 61 +++- + arch/x86/entry/vdso/Makefile | 6 +- + arch/x86/entry/vdso/vclock_gettime.c | 16 +- + arch/x86/entry/vdso/vma.c | 7 +- + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/ia32/ia32_signal.c | 93 ----- + arch/x86/include/asm/barrier.h | 11 - + arch/x86/include/asm/context_tracking.h | 10 - + arch/x86/include/asm/elf.h | 17 +- + arch/x86/include/asm/ia32.h | 9 - + arch/x86/include/asm/iosf_mbi.h | 8 +- + arch/x86/include/asm/msr.h | 61 ++-- + arch/x86/include/asm/paravirt.h | 34 -- + arch/x86/include/asm/paravirt_types.h | 2 - + arch/x86/include/asm/pmc_atom.h | 29 ++ + arch/x86/include/asm/pvclock.h | 10 +- + arch/x86/include/asm/qrwlock.h | 4 +- + arch/x86/include/asm/sigframe.h | 10 + + arch/x86/include/asm/signal.h | 1 + + arch/x86/include/asm/stackprotector.h | 2 +- + arch/x86/include/asm/traps.h | 4 +- + arch/x86/include/asm/tsc.h | 18 +- + arch/x86/kernel/Makefile | 3 +- + arch/x86/kernel/apb_timer.c | 8 +- + arch/x86/kernel/apic/apic.c | 8 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/apic/msi.c | 2 +- + arch/x86/kernel/apic/vector.c | 11 +- + arch/x86/kernel/cpu/amd.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce.c | 9 +- + arch/x86/kernel/cpu/mcheck/p5.c | 5 +- + arch/x86/kernel/cpu/mcheck/winchip.c | 4 +- + arch/x86/kernel/cpu/perf_event.c | 2 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/hpet.c | 8 +- + arch/x86/kernel/irq.c | 31 +- + arch/x86/kernel/paravirt.c | 2 - + arch/x86/kernel/paravirt_patch_32.c | 2 - + arch/x86/kernel/process_64.c | 4 +- + arch/x86/kernel/ptrace.c | 340 +++++-------------- + arch/x86/kernel/signal.c | 29 +- + arch/x86/kernel/signal_compat.c | 95 ++++++ + arch/x86/kernel/trace_clock.c | 7 +- + arch/x86/kernel/traps.c | 87 ++--- + arch/x86/kernel/tsc.c | 12 +- + arch/x86/kernel/tsc_sync.c | 14 +- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/vmx.c | 4 +- + arch/x86/kvm/x86.c | 26 +- + arch/x86/lib/delay.c | 13 +- + arch/x86/platform/Makefile | 1 + + arch/x86/platform/atom/Makefile | 3 +- + arch/x86/{kernel => platform/atom}/pmc_atom.c | 302 +++++++++++------ + arch/x86/platform/intel/Makefile | 1 + + arch/x86/{kernel => platform/intel}/iosf_mbi.c | 27 +- + arch/x86/platform/uv/uv_irq.c | 2 +- + arch/x86/um/asm/barrier.h | 13 - + arch/x86/xen/enlighten.c | 3 - + drivers/cpufreq/intel_pstate.c | 2 +- + drivers/input/gameport/gameport.c | 4 +- + drivers/input/joystick/analog.c | 4 +- + drivers/irqchip/exynos-combiner.c | 16 +- + drivers/irqchip/irq-armada-370-xp.c | 5 +- + drivers/irqchip/irq-atmel-aic.c | 2 +- + drivers/irqchip/irq-atmel-aic5.c | 2 +- + drivers/irqchip/irq-bcm2835.c | 3 +- + drivers/irqchip/irq-bcm7038-l1.c | 7 +- + drivers/irqchip/irq-bcm7120-l2.c | 7 +- + drivers/irqchip/irq-brcmstb-l2.c | 10 +- + drivers/irqchip/irq-clps711x.c | 3 +- + drivers/irqchip/irq-crossbar.c | 3 +- + drivers/irqchip/irq-digicolor.c | 3 +- + drivers/irqchip/irq-dw-apb-ictl.c | 56 ++- + drivers/irqchip/irq-gic-v3-its.c | 3 +- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic.c | 11 +- + drivers/irqchip/irq-hip04.c | 2 +- + drivers/irqchip/irq-imgpdc.c | 11 +- + drivers/irqchip/irq-ingenic.c | 3 +- + drivers/irqchip/irq-keystone.c | 6 +- + drivers/irqchip/irq-metag-ext.c | 9 +- + drivers/irqchip/irq-metag.c | 3 +- + drivers/irqchip/irq-mips-cpu.c | 3 +- + drivers/irqchip/irq-mips-gic.c | 20 +- + drivers/irqchip/irq-mmp.c | 6 +- + drivers/irqchip/irq-moxart.c | 3 +- + drivers/irqchip/irq-mtk-sysirq.c | 3 +- + drivers/irqchip/irq-mxs.c | 3 +- + drivers/irqchip/irq-nvic.c | 3 +- + drivers/irqchip/irq-omap-intc.c | 3 +- + drivers/irqchip/irq-or1k-pic.c | 3 +- + drivers/irqchip/irq-orion.c | 9 +- + drivers/irqchip/irq-renesas-h8300h.c | 2 - + drivers/irqchip/irq-renesas-h8s.c | 2 +- + drivers/irqchip/irq-s3c24xx.c | 11 +- + drivers/irqchip/irq-sirfsoc.c | 50 +-- + drivers/irqchip/irq-sun4i.c | 3 +- + drivers/irqchip/irq-sunxi-nmi.c | 7 +- + drivers/irqchip/irq-tb10x.c | 9 +- + drivers/irqchip/irq-tegra.c | 3 +- + drivers/irqchip/irq-versatile-fpga.c | 10 +- + drivers/irqchip/irq-vf610-mscm-ir.c | 3 +- + drivers/irqchip/irq-vic.c | 7 +- + drivers/irqchip/irq-vt8500.c | 9 +- + drivers/irqchip/irq-xtensa-mx.c | 3 +- + drivers/irqchip/irq-xtensa-pic.c | 3 +- + drivers/irqchip/irq-zevio.c | 3 +- + drivers/irqchip/spear-shirq.c | 7 +- + drivers/net/hamradio/baycom_epp.c | 2 +- + drivers/pci/host/pci-keystone-dw.c | 15 +- + drivers/pci/host/pci-keystone.c | 13 +- + drivers/pci/host/pcie-designware.c | 2 +- + drivers/pci/msi.c | 4 +- + drivers/staging/media/lirc/lirc_serial.c | 63 +--- + drivers/thermal/intel_powerclamp.c | 4 +- + drivers/xen/events/events_base.c | 4 +- + include/asm-generic/qrwlock.h | 58 ++-- + include/linux/context_tracking.h | 15 + + include/linux/context_tracking_state.h | 1 + + include/linux/irq.h | 5 +- + kernel/irq/chip.c | 22 +- + kernel/irq/handle.c | 4 +- + kernel/irq/internals.h | 11 +- + kernel/irq/irqdesc.c | 2 +- + kernel/irq/manage.c | 62 ++-- + kernel/irq/pm.c | 12 +- + kernel/irq/resend.c | 4 +- + kernel/irq/spurious.c | 26 +- + kernel/locking/qrwlock.c | 23 +- + kernel/notifier.c | 2 + + kernel/sched/fair.c | 109 ++---- + kernel/sched/features.h | 18 +- + tools/lib/api/fs/debugfs.c | 15 +- + tools/perf/builtin-probe.c | 3 +- + tools/perf/builtin-record.c | 4 +- + tools/perf/builtin-trace.c | 178 ++++++---- + tools/perf/perf.h | 1 + + tools/perf/util/evlist.c | 6 +- + tools/perf/util/evsel.c | 37 +- + tools/perf/util/evsel.h | 7 +- + tools/perf/util/parse-events.c | 3 +- + tools/perf/util/string.c | 39 +++ + tools/perf/util/util.h | 12 + + .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 4 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/syscall_arg_fault.c | 130 +++++++ + 165 files changed, 1861 insertions(+), 1594 deletions(-) + create mode 100644 arch/x86/entry/common.c + delete mode 100644 arch/x86/include/asm/context_tracking.h + create mode 100644 arch/x86/kernel/signal_compat.c + rename arch/x86/{kernel => platform/atom}/pmc_atom.c (53%) + create mode 100644 arch/x86/platform/intel/Makefile + rename arch/x86/{kernel => platform/intel}/iosf_mbi.c (93%) + create mode 100644 tools/testing/selftests/x86/syscall_arg_fault.c +Merging clockevents/clockevents/next (6fd817226ae6 clockevents/drivers/timer-sp804: Migrate to new 'set-state' interface) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. + arch/x86/kernel/i8253.c | 2 +- + drivers/clocksource/Kconfig | 2 +- + drivers/clocksource/arm_arch_timer.c | 52 +++++----- + drivers/clocksource/arm_global_timer.c | 37 ++++--- + drivers/clocksource/asm9260_timer.c | 64 +++++++----- + drivers/clocksource/bcm2835_timer.c | 16 --- + drivers/clocksource/bcm_kona_timer.c | 17 +--- + drivers/clocksource/cadence_ttc_timer.c | 59 ++++++------ + drivers/clocksource/clps711x-timer.c | 6 -- + drivers/clocksource/cs5535-clockevt.c | 24 +++-- + drivers/clocksource/dummy_timer.c | 10 -- + drivers/clocksource/dw_apb_timer.c | 146 ++++++++++++++++------------ + drivers/clocksource/em_sti.c | 39 +++----- + drivers/clocksource/exynos_mct.c | 101 +++++++++---------- + drivers/clocksource/fsl_ftm_timer.c | 35 ++++--- + drivers/clocksource/i8253.c | 77 ++++++++------- + drivers/clocksource/meson6_timer.c | 50 +++++----- + drivers/clocksource/metag_generic.c | 20 ---- + drivers/clocksource/mips-gic-timer.c | 7 -- + drivers/clocksource/moxart_timer.c | 49 +++++----- + drivers/clocksource/mtk_timer.c | 32 +++--- + drivers/clocksource/mxs_timer.c | 80 ++++++--------- + drivers/clocksource/nomadik-mtu.c | 58 +++++------ + drivers/clocksource/pxa_timer.c | 39 +++----- + drivers/clocksource/qcom-timer.c | 24 ++--- + drivers/clocksource/rockchip_timer.c | 32 +++--- + drivers/clocksource/samsung_pwm_timer.c | 41 ++++---- + drivers/clocksource/sh_cmt.c | 65 ++++++------- + drivers/clocksource/sh_mtu2.c | 42 +++----- + drivers/clocksource/sh_tmu.c | 63 ++++++------ + drivers/clocksource/sun4i_timer.c | 41 ++++---- + drivers/clocksource/tcb_clksrc.c | 93 ++++++++++-------- + drivers/clocksource/tegra20_timer.c | 45 +++++---- + drivers/clocksource/time-armada-370-xp.c | 53 +++++----- + drivers/clocksource/time-efm32.c | 66 +++++++------ + drivers/clocksource/time-orion.c | 46 +++++---- + drivers/clocksource/timer-atlas7.c | 19 ++-- + drivers/clocksource/timer-atmel-pit.c | 41 ++++---- + drivers/clocksource/timer-atmel-st.c | 69 +++++++------ + drivers/clocksource/timer-digicolor.c | 41 ++++---- + drivers/clocksource/timer-imx-gpt.c | 75 ++++++++------- + drivers/clocksource/timer-integrator-ap.c | 58 ++++++----- + drivers/clocksource/timer-keystone.c | 44 +++------ + drivers/clocksource/timer-prima2.c | 34 +++---- + drivers/clocksource/timer-sp804.c | 54 +++++------ + drivers/clocksource/timer-stm32.c | 30 +++--- + drivers/clocksource/timer-sun5i.c | 45 +++++---- + drivers/clocksource/timer-u300.c | 155 +++++++++++++++--------------- + drivers/clocksource/vf_pit_timer.c | 27 +++--- + drivers/clocksource/vt8500_timer.c | 29 ++---- + drivers/clocksource/zevio-timer.c | 44 ++++----- + 51 files changed, 1157 insertions(+), 1241 deletions(-) +Merging edac/linux_next (fa2ce64f85be sb_edac: support for Broadwell -EP and -EX) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (99e1dfb7d209 EDAC, mce_amd: Don't emit 'CE' for Deferred error) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/mce_amd.c | 3 ++- + drivers/edac/xgene_edac.c | 1 - + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (b44754d8262d ring_buffer: Allow to exit the ring buffer benchmark immediately) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (80b4c788d8f2 Merge with 02300fdb3e5f (rcu: Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN())) +$ git merge rcu/rcu/next +Resolved 'arch/x86/kernel/traps.c' using previous resolution. +Auto-merging scripts/checkpatch.pl +Auto-merging lib/Kconfig.debug +Auto-merging kernel/cpu.c +Auto-merging init/Kconfig +Auto-merging arch/x86/kernel/traps.c +CONFLICT (content): Merge conflict in arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6e42aecea0cd] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/rcu_dereference.txt | 2 +- + Documentation/RCU/stallwarn.txt | 29 +- + Documentation/RCU/trace.txt | 36 +- + Documentation/RCU/whatisRCU.txt | 2 +- + Documentation/kernel-parameters.txt | 35 +- + Documentation/memory-barriers.txt | 404 ++++++------- + MAINTAINERS | 6 +- + arch/powerpc/include/asm/spinlock.h | 2 - + arch/x86/kernel/cpu/mcheck/mce.c | 6 +- + arch/x86/kernel/traps.c | 2 +- + drivers/base/power/opp.c | 4 +- + include/linux/fdtable.h | 4 +- + include/linux/rcupdate.h | 144 +++-- + include/linux/rcutiny.h | 10 + + include/linux/rcutree.h | 2 + + include/linux/spinlock.h | 10 - + include/linux/types.h | 3 + + include/trace/events/rcu.h | 1 - + init/Kconfig | 10 +- + kernel/cgroup.c | 4 +- + kernel/cpu.c | 10 +- + kernel/pid.c | 5 +- + kernel/rcu/rcutorture.c | 42 +- + kernel/rcu/srcu.c | 15 +- + kernel/rcu/tiny.c | 8 +- + kernel/rcu/tree.c | 673 ++++++++++++--------- + kernel/rcu/tree.h | 88 ++- + kernel/rcu/tree_plugin.h | 130 +--- + kernel/rcu/tree_trace.c | 19 +- + kernel/rcu/update.c | 90 ++- + kernel/sched/core.c | 8 +- + kernel/time/Kconfig | 2 - + kernel/workqueue.c | 20 +- + lib/Kconfig.debug | 16 +- + scripts/checkpatch.pl | 19 + + security/device_cgroup.c | 6 +- + .../selftests/rcutorture/configs/rcu/TASKS01 | 4 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02 | 1 - + .../selftests/rcutorture/configs/rcu/TREE02-T | 1 - + .../selftests/rcutorture/configs/rcu/TREE03 | 1 - + .../selftests/rcutorture/configs/rcu/TREE04 | 1 - + .../selftests/rcutorture/configs/rcu/TREE05 | 1 - + .../selftests/rcutorture/configs/rcu/TREE06 | 1 - + .../selftests/rcutorture/configs/rcu/TREE07 | 1 - + .../selftests/rcutorture/configs/rcu/TREE08 | 1 - + .../selftests/rcutorture/configs/rcu/TREE08-T | 1 - + .../selftests/rcutorture/configs/rcu/TREE09 | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 1 - + 49 files changed, 976 insertions(+), 907 deletions(-) +$ git am -3 ../patches/0001-rcu-merge-fix-for-Rename-rcu_lockdep_assert-to-RCU_L.patch +Applying: rcu: merge fix for Rename rcu_lockdep_assert() to RCU_LOCKDEP_WARN() +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/irq.c +M kernel/notifier.c +$ git add -A . +$ git commit -v -a --amend +[master 47720d8ca0f8] Merge remote-tracking branch 'rcu/rcu/next' + Date: Mon Jul 20 11:47:22 2015 +1000 +Merging kvm/linux-next (a88464a8b0ff kvm: add hyper-v crash msrs values) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (c62e631d4a8e KVM: arm/arm64: vgic: Remove useless arm-gic.h #include) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (ea2cdd27dce6 KVM: s390: introduce KMSG_COMPONENT for kvm-s390) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (ffb7dbed47da xen/arm: Define xen_arch_suspend()) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (83cb8557e8d2 percpu: update incorrect comment for this_cpu_*() operations) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu-defs.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging workqueues/for-next (badb7f5e8bdd workqueue: add myself as a dedicated reviwer) +$ git merge workqueues/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +Merging drivers-x86/for-next (d770e558e219 Linux 4.2-rc1) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (28a33dcde4bf Merge remote-tracking branches 'regmap/topic/force-update' and 'regmap/topic/seq-delay' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap.c | 61 ++++++++++++++++++++++++++++++++++++++------ + include/linux/regmap.h | 5 +++- + 2 files changed, 57 insertions(+), 9 deletions(-) +$ git am -3 ../patches/mfd__Fixup_clients_of_multi_reg_write_register_patch.patch +Applying: mfd: Fixup clients of multi_reg_write/register_patch +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mfd/wm5110-tables.c +M drivers/mfd/wm8998-tables.c +$ git add -A . +$ git commit -v -a --amend +[master f936d49c46ed] Merge remote-tracking branch 'regmap/for-next' + Date: Mon Jul 20 12:20:07 2015 +1000 +$ git am -3 ../patches/ASoC__wm5110__Use_reg_sequence_for_multi_reg_write_register_patch.patch +Applying: ASoC: wm5110: Use reg_sequence for multi_reg_write/register_patch +Using index info to reconstruct a base tree... +M sound/soc/codecs/wm5110.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging hsi/for-next (f451e76f8969 HSI: nokia-modem: use flags argument of devm_gpiod_get to set direction) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (b67893206fc0 leds:lp55xx: fix firmware loading error) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (cc5c8d2cc014 ipmi: Make some data const that was only read) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_powernv.c +Merge made by the 'recursive' strategy. + drivers/acpi/acpi_pnp.c | 2 - + drivers/char/ipmi/ipmi_bt_sm.c | 2 +- + drivers/char/ipmi/ipmi_kcs_sm.c | 2 +- + drivers/char/ipmi/ipmi_msghandler.c | 16 +- + drivers/char/ipmi/ipmi_powernv.c | 1 - + drivers/char/ipmi/ipmi_si_intf.c | 373 ++++++++++++++++++------------------ + drivers/char/ipmi/ipmi_si_sm.h | 10 +- + drivers/char/ipmi/ipmi_smic_sm.c | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 6 +- + include/linux/ipmi_smi.h | 2 +- + 10 files changed, 207 insertions(+), 209 deletions(-) +Merging driver-core/driver-core-next (bc0195aad0da Linux 4.2-rc2) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (bc0195aad0da Linux 4.2-rc2) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (bc0195aad0da Linux 4.2-rc2) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (d770e558e219 Linux 4.2-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (d770e558e219 Linux 4.2-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (b8d1f261fe7e staging: dgap: remove duplicate code) +$ git merge staging/staging-next +Removing drivers/staging/xgifb/vb_util.c +Auto-merging drivers/staging/vt6655/device_main.c +Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h +Auto-merging drivers/iio/temperature/tmp006.c +Auto-merging drivers/iio/light/tcs3414.c +Auto-merging drivers/iio/light/ltr501.c +Auto-merging drivers/iio/light/cm3323.c +Auto-merging drivers/iio/light/Kconfig +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/accel/bmc150-accel.c +Auto-merging Documentation/ABI/testing/sysfs-bus-iio +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 5 + + drivers/iio/accel/bma180.c | 1 - + drivers/iio/accel/bmc150-accel.c | 93 ++-- + drivers/iio/accel/kxcjk-1013.c | 3 - + drivers/iio/accel/mma9551_core.c | 35 +- + drivers/iio/accel/mma9551_core.h | 6 +- + drivers/iio/accel/mma9553.c | 81 +-- + drivers/iio/accel/st_accel_i2c.c | 1 - + drivers/iio/accel/stk8312.c | 380 +++++++++++-- + drivers/iio/accel/stk8ba50.c | 368 ++++++++++-- + drivers/iio/adc/Kconfig | 48 +- + drivers/iio/adc/cc10001_adc.c | 26 +- + drivers/iio/adc/mcp3422.c | 1 - + drivers/iio/adc/ti-adc081c.c | 1 - + drivers/iio/common/ssp_sensors/ssp_dev.c | 1 - + drivers/iio/dac/ad5064.c | 1 - + drivers/iio/dac/ad5380.c | 1 - + drivers/iio/dac/ad5446.c | 1 - + drivers/iio/dac/max5821.c | 1 - + drivers/iio/frequency/adf4350.c | 1 - + drivers/iio/gyro/itg3200_core.c | 1 - + drivers/iio/gyro/st_gyro_i2c.c | 1 - + drivers/iio/humidity/si7005.c | 1 - + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 7 +- + drivers/iio/industrialio-buffer.c | 18 +- + drivers/iio/industrialio-core.c | 8 + + drivers/iio/industrialio-triggered-buffer.c | 12 +- + drivers/iio/light/Kconfig | 13 +- + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9300.c | 1 - + drivers/iio/light/bh1750.c | 1 - + drivers/iio/light/cm32181.c | 1 - + drivers/iio/light/cm3232.c | 1 - + drivers/iio/light/cm3323.c | 19 +- + drivers/iio/light/cm36651.c | 1 - + drivers/iio/light/gp2ap020a00f.c | 1 - + drivers/iio/light/hid-sensor-prox.c | 3 +- + drivers/iio/light/isl29125.c | 13 +- + drivers/iio/light/jsa1212.c | 1 - + drivers/iio/light/ltr501.c | 1 - + drivers/iio/light/rpr0521.c | 615 +++++++++++++++++++++ + drivers/iio/light/tcs3414.c | 1 - + drivers/iio/light/tcs3472.c | 1 - + drivers/iio/light/tsl4531.c | 1 - + drivers/iio/light/vcnl4000.c | 1 - + drivers/iio/magnetometer/bmc150_magn.c | 71 +-- + drivers/iio/magnetometer/st_magn_i2c.c | 1 - + drivers/iio/pressure/Kconfig | 6 +- + drivers/iio/pressure/ms5611.h | 16 +- + drivers/iio/pressure/ms5611_core.c | 82 ++- + drivers/iio/pressure/ms5611_i2c.c | 6 +- + drivers/iio/pressure/ms5611_spi.c | 6 +- + drivers/iio/pressure/st_pressure_i2c.c | 1 - + drivers/iio/temperature/mlx90614.c | 1 - + drivers/iio/temperature/tmp006.c | 5 +- + drivers/staging/android/ion/ion.c | 24 +- + drivers/staging/android/ion/ion_chunk_heap.c | 4 +- + drivers/staging/android/ion/ion_page_pool.c | 5 +- + drivers/staging/android/ion/ion_system_heap.c | 16 +- + drivers/staging/comedi/Kconfig | 2 +- + drivers/staging/comedi/comedi_compat32.c | 3 +- + drivers/staging/comedi/comedi_fops.c | 6 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 6 +- + drivers/staging/comedi/drivers/dac02.c | 6 +- + drivers/staging/comedi/drivers/das08_cs.c | 4 +- + drivers/staging/comedi/drivers/das16m1.c | 41 +- + drivers/staging/comedi/drivers/dmm32at.c | 6 +- + drivers/staging/comedi/drivers/fl512.c | 6 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +- + drivers/staging/comedi/drivers/s626.c | 6 +- + drivers/staging/dgap/dgap.c | 42 +- + drivers/staging/fbtft/Kconfig | 6 + + drivers/staging/fbtft/Makefile | 1 + + drivers/staging/fbtft/fb_uc1611.c | 350 ++++++++++++ + drivers/staging/fbtft/fbtft-core.c | 5 + + drivers/staging/fbtft/fbtft_device.c | 31 ++ + drivers/staging/fbtft/flexfb.c | 26 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 31 +- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 24 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 1 - + drivers/staging/iio/addac/adt7316-i2c.c | 1 - + drivers/staging/iio/iio_dummy_evgen.c | 1 + + drivers/staging/iio/iio_simple_dummy.c | 2 - + drivers/staging/iio/iio_simple_dummy.h | 1 + + drivers/staging/iio/iio_simple_dummy_buffer.c | 2 +- + drivers/staging/iio/light/isl29018.c | 1 - + drivers/staging/iio/light/isl29028.c | 1 - + .../lustre/include/linux/libcfs/libcfs_debug.h | 1 - + .../lustre/include/linux/libcfs/libcfs_fail.h | 18 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 28 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 12 - + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 - + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 1 + + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 3 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 11 - + drivers/staging/lustre/lustre/fid/fid_request.c | 4 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 2 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 2 +- + drivers/staging/lustre/lustre/include/obd_class.h | 3 +- + .../staging/lustre/lustre/include/obd_support.h | 16 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 17 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 8 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 1 + + drivers/staging/lustre/lustre/libcfs/debug.c | 149 ++++- + drivers/staging/lustre/lustre/libcfs/fail.c | 2 +- + drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 +- + drivers/staging/lustre/lustre/libcfs/module.c | 346 +++--------- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 12 - + drivers/staging/lustre/lustre/libcfs/tracefile.h | 1 - + drivers/staging/lustre/lustre/llite/file.c | 5 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 1 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 9 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 18 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 4 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 19 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 22 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 2 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 374 +++---------- + drivers/staging/lustre/lustre/obdclass/llog.c | 8 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 4 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 2 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 17 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 12 +- + drivers/staging/lustre/lustre/obdclass/uuid.c | 34 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 6 - + drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 8 +- + drivers/staging/lustre/sysfs-fs-lustre | 103 ++++ + drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 - + drivers/staging/octeon/ethernet-tx.c | 10 +- + drivers/staging/ozwpan/ozusbsvc1.c | 1 + + drivers/staging/rtl8188eu/core/rtw_ap.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 + + drivers/staging/rtl8188eu/core/rtw_mlme.c | 15 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 6 - + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 + + drivers/staging/rtl8188eu/hal/hal_com.c | 27 +- + drivers/staging/rtl8188eu/hal/hal_intf.c | 32 -- + drivers/staging/rtl8188eu/hal/rf_cfg.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 33 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 72 +-- + drivers/staging/rtl8188eu/include/HalVerDef.h | 84 --- + drivers/staging/rtl8188eu/include/hal_intf.h | 16 - + drivers/staging/rtl8188eu/include/ieee80211.h | 10 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 7 - + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 1 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 4 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 59 +- + drivers/staging/rtl8192e/dot11d.c | 39 -- + drivers/staging/rtl8192e/dot11d.h | 6 - + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 46 -- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 1 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 27 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 1 - + .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 2 - + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 3 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 261 ++------- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 33 -- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 12 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 22 - + drivers/staging/rtl8192e/rtl8192e/rtl_ps.h | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 7 - + drivers/staging/rtl8192e/rtl819x_BA.h | 5 - + drivers/staging/rtl8192e/rtl819x_HT.h | 2 - + drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 5 - + drivers/staging/rtl8192e/rtl819x_TS.h | 2 - + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 92 --- + drivers/staging/rtl8192e/rtllib_debug.h | 8 - + drivers/staging/rtl8192e/rtllib_rx.c | 11 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 30 +- + drivers/staging/rtl8192e/rtllib_tx.c | 9 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 4 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 4 +- + drivers/staging/rtl8712/rtl871x_security.c | 35 +- + drivers/staging/rtl8723au/hal/odm.c | 2 +- + drivers/staging/rts5208/sd.c | 11 +- + drivers/staging/sm750fb/ddk750_chip.c | 15 +- + drivers/staging/sm750fb/ddk750_chip.h | 12 +- + drivers/staging/sm750fb/ddk750_display.c | 170 +++--- + drivers/staging/sm750fb/ddk750_display.h | 11 +- + drivers/staging/sm750fb/ddk750_dvi.c | 75 ++- + drivers/staging/sm750fb/ddk750_dvi.h | 3 +- + drivers/staging/sm750fb/ddk750_help.c | 8 +- + drivers/staging/sm750fb/ddk750_help.h | 4 +- + drivers/staging/sm750fb/ddk750_hwi2c.c | 244 ++++---- + drivers/staging/sm750fb/ddk750_mode.c | 164 +++--- + drivers/staging/sm750fb/ddk750_mode.h | 52 +- + drivers/staging/sm750fb/ddk750_power.c | 254 ++++----- + drivers/staging/sm750fb/ddk750_power.h | 11 +- + drivers/staging/sm750fb/ddk750_reg.h | 18 +- + drivers/staging/sm750fb/ddk750_sii164.c | 389 +++++++------ + drivers/staging/sm750fb/ddk750_sii164.h | 31 +- + drivers/staging/sm750fb/sm750.c | 8 +- + drivers/staging/sm750fb/sm750.h | 58 +- + drivers/staging/sm750fb/sm750_accel.c | 381 ++++++------- + drivers/staging/sm750fb/sm750_accel.h | 4 +- + drivers/staging/sm750fb/sm750_cursor.c | 51 +- + drivers/staging/sm750fb/sm750_help.h | 28 +- + drivers/staging/sm750fb/sm750_hw.c | 414 +++++++------- + drivers/staging/sm750fb/sm750_hw.h | 42 +- + drivers/staging/sm7xxfb/sm7xx.h | 39 +- + drivers/staging/sm7xxfb/sm7xxfb.c | 69 +-- + drivers/staging/speakup/keyhelp.c | 2 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1 - + drivers/staging/unisys/Kconfig | 2 +- + drivers/staging/unisys/include/visorbus.h | 3 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 9 +- + .../unisys/visorbus/controlvmcompletionstatus.h | 9 +- + drivers/staging/unisys/visorbus/iovmcall_gnuc.h | 9 +- + drivers/staging/unisys/visorbus/periodic_work.c | 9 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 9 +- + drivers/staging/unisys/visorbus/vbusdeviceinfo.h | 9 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 62 +-- + drivers/staging/unisys/visorbus/visorbus_private.h | 9 +- + drivers/staging/unisys/visorbus/visorchannel.c | 22 +- + drivers/staging/unisys/visorbus/visorchipset.c | 22 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 9 +- + drivers/staging/unisys/visornic/visornic_main.c | 232 ++++++-- + drivers/staging/vme/devices/vme_user.c | 164 ++---- + drivers/staging/vt6655/device.h | 1 + + drivers/staging/vt6655/device_main.c | 12 +- + drivers/staging/vt6655/power.c | 16 +- + drivers/staging/vt6655/rf.c | 532 +++++++++--------- + drivers/staging/vt6655/rf.h | 24 +- + drivers/staging/vt6655/upc.h | 36 +- + drivers/staging/vt6656/rxtx.c | 7 +- + drivers/staging/wilc1000/coreconfigurator.c | 28 +- + drivers/staging/wilc1000/fifo_buffer.c | 11 +- + drivers/staging/wilc1000/host_interface.c | 392 ++++++------- + drivers/staging/wilc1000/linux_mon.c | 6 +- + drivers/staging/wilc1000/linux_wlan.c | 2 - + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 15 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.c | 58 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 12 +- + drivers/staging/wilc1000/wilc_wlan.c | 5 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 6 - + drivers/staging/wilc1000/wilc_wlan_if.h | 4 +- + drivers/staging/xgifb/Makefile | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 4 +- + drivers/staging/xgifb/vb_util.c | 42 -- + drivers/staging/xgifb/vb_util.h | 44 +- + include/linux/iio/triggered_buffer.h | 4 +- + tools/iio/generic_buffer.c | 67 ++- + tools/iio/iio_event_monitor.c | 27 +- + tools/iio/iio_utils.c | 121 ++-- + tools/iio/iio_utils.h | 15 +- + tools/iio/lsiio.c | 43 +- + 279 files changed, 5165 insertions(+), 4632 deletions(-) + create mode 100644 drivers/iio/light/rpr0521.c + create mode 100644 drivers/staging/fbtft/fb_uc1611.c + delete mode 100644 drivers/staging/xgifb/vb_util.c +Merging char-misc/char-misc-next (bc0195aad0da Linux 4.2-rc2) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (00f734019663 extcon: arizona: Simplify pdata symantics for micd_dbtime) +$ git merge extcon/extcon-next +Auto-merging drivers/extcon/extcon-max77843.c +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 101 ++++++++++++++++++++++++++++++++------- + drivers/extcon/extcon-gpio.c | 18 ------- + drivers/extcon/extcon-max77843.c | 9 ++++ + drivers/extcon/extcon-palmas.c | 16 ------- + drivers/extcon/extcon.c | 40 ++++++++++++---- + include/linux/extcon.h | 7 --- + 6 files changed, 123 insertions(+), 68 deletions(-) +Merging kdbus/kdbus (748cf9547ea3 kdbus: fix unused %docs make-targets) +$ git merge kdbus/kdbus +Auto-merging tools/testing/selftests/Makefile +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/Kbuild +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/kdbus/.gitignore | 2 + + Documentation/kdbus/Makefile | 44 + + Documentation/kdbus/kdbus.bus.xml | 344 ++++ + Documentation/kdbus/kdbus.connection.xml | 1244 ++++++++++++ + Documentation/kdbus/kdbus.endpoint.xml | 429 +++++ + Documentation/kdbus/kdbus.fs.xml | 124 ++ + Documentation/kdbus/kdbus.item.xml | 839 ++++++++ + Documentation/kdbus/kdbus.match.xml | 555 ++++++ + Documentation/kdbus/kdbus.message.xml | 1276 +++++++++++++ + Documentation/kdbus/kdbus.name.xml | 711 +++++++ + Documentation/kdbus/kdbus.policy.xml | 406 ++++ + Documentation/kdbus/kdbus.pool.xml | 326 ++++ + Documentation/kdbus/kdbus.xml | 1012 ++++++++++ + Documentation/kdbus/stylesheet.xsl | 16 + + MAINTAINERS | 13 + + Makefile | 1 + + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/kdbus.h | 980 ++++++++++ + include/uapi/linux/magic.h | 2 + + init/Kconfig | 13 + + ipc/Makefile | 2 +- + ipc/kdbus/Makefile | 33 + + ipc/kdbus/bus.c | 514 +++++ + ipc/kdbus/bus.h | 99 + + ipc/kdbus/connection.c | 2207 ++++++++++++++++++++++ + ipc/kdbus/connection.h | 261 +++ + ipc/kdbus/domain.c | 296 +++ + ipc/kdbus/domain.h | 77 + + ipc/kdbus/endpoint.c | 275 +++ + ipc/kdbus/endpoint.h | 67 + + ipc/kdbus/fs.c | 508 +++++ + ipc/kdbus/fs.h | 28 + + ipc/kdbus/handle.c | 709 +++++++ + ipc/kdbus/handle.h | 103 + + ipc/kdbus/item.c | 293 +++ + ipc/kdbus/item.h | 61 + + ipc/kdbus/limits.h | 61 + + ipc/kdbus/main.c | 114 ++ + ipc/kdbus/match.c | 546 ++++++ + ipc/kdbus/match.h | 35 + + ipc/kdbus/message.c | 1040 ++++++++++ + ipc/kdbus/message.h | 120 ++ + ipc/kdbus/metadata.c | 1342 +++++++++++++ + ipc/kdbus/metadata.h | 86 + + ipc/kdbus/names.c | 770 ++++++++ + ipc/kdbus/names.h | 74 + + ipc/kdbus/node.c | 897 +++++++++ + ipc/kdbus/node.h | 86 + + ipc/kdbus/notify.c | 204 ++ + ipc/kdbus/notify.h | 30 + + ipc/kdbus/policy.c | 489 +++++ + ipc/kdbus/policy.h | 51 + + ipc/kdbus/pool.c | 728 +++++++ + ipc/kdbus/pool.h | 46 + + ipc/kdbus/queue.c | 363 ++++ + ipc/kdbus/queue.h | 84 + + ipc/kdbus/reply.c | 252 +++ + ipc/kdbus/reply.h | 68 + + ipc/kdbus/util.c | 156 ++ + ipc/kdbus/util.h | 73 + + samples/Kconfig | 7 + + samples/Makefile | 3 +- + samples/kdbus/.gitignore | 1 + + samples/kdbus/Makefile | 9 + + samples/kdbus/kdbus-api.h | 114 ++ + samples/kdbus/kdbus-workers.c | 1345 +++++++++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kdbus/.gitignore | 1 + + tools/testing/selftests/kdbus/Makefile | 49 + + tools/testing/selftests/kdbus/kdbus-enum.c | 94 + + tools/testing/selftests/kdbus/kdbus-enum.h | 15 + + tools/testing/selftests/kdbus/kdbus-test.c | 899 +++++++++ + tools/testing/selftests/kdbus/kdbus-test.h | 83 + + tools/testing/selftests/kdbus/kdbus-util.c | 1611 ++++++++++++++++ + tools/testing/selftests/kdbus/kdbus-util.h | 218 +++ + tools/testing/selftests/kdbus/test-activator.c | 318 ++++ + tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++ + tools/testing/selftests/kdbus/test-bus.c | 175 ++ + tools/testing/selftests/kdbus/test-chat.c | 122 ++ + tools/testing/selftests/kdbus/test-connection.c | 597 ++++++ + tools/testing/selftests/kdbus/test-daemon.c | 65 + + tools/testing/selftests/kdbus/test-endpoint.c | 352 ++++ + tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++ + tools/testing/selftests/kdbus/test-free.c | 64 + + tools/testing/selftests/kdbus/test-match.c | 441 +++++ + tools/testing/selftests/kdbus/test-message.c | 734 +++++++ + tools/testing/selftests/kdbus/test-metadata-ns.c | 500 +++++ + tools/testing/selftests/kdbus/test-monitor.c | 176 ++ + tools/testing/selftests/kdbus/test-names.c | 194 ++ + tools/testing/selftests/kdbus/test-policy-ns.c | 632 +++++++ + tools/testing/selftests/kdbus/test-policy-priv.c | 1285 +++++++++++++ + tools/testing/selftests/kdbus/test-policy.c | 80 + + tools/testing/selftests/kdbus/test-sync.c | 369 ++++ + tools/testing/selftests/kdbus/test-timeout.c | 99 + + 96 files changed, 33479 insertions(+), 3 deletions(-) + create mode 100644 Documentation/kdbus/.gitignore + create mode 100644 Documentation/kdbus/Makefile + create mode 100644 Documentation/kdbus/kdbus.bus.xml + create mode 100644 Documentation/kdbus/kdbus.connection.xml + create mode 100644 Documentation/kdbus/kdbus.endpoint.xml + create mode 100644 Documentation/kdbus/kdbus.fs.xml + create mode 100644 Documentation/kdbus/kdbus.item.xml + create mode 100644 Documentation/kdbus/kdbus.match.xml + create mode 100644 Documentation/kdbus/kdbus.message.xml + create mode 100644 Documentation/kdbus/kdbus.name.xml + create mode 100644 Documentation/kdbus/kdbus.policy.xml + create mode 100644 Documentation/kdbus/kdbus.pool.xml + create mode 100644 Documentation/kdbus/kdbus.xml + create mode 100644 Documentation/kdbus/stylesheet.xsl + create mode 100644 include/uapi/linux/kdbus.h + create mode 100644 ipc/kdbus/Makefile + create mode 100644 ipc/kdbus/bus.c + create mode 100644 ipc/kdbus/bus.h + create mode 100644 ipc/kdbus/connection.c + create mode 100644 ipc/kdbus/connection.h + create mode 100644 ipc/kdbus/domain.c + create mode 100644 ipc/kdbus/domain.h + create mode 100644 ipc/kdbus/endpoint.c + create mode 100644 ipc/kdbus/endpoint.h + create mode 100644 ipc/kdbus/fs.c + create mode 100644 ipc/kdbus/fs.h + create mode 100644 ipc/kdbus/handle.c + create mode 100644 ipc/kdbus/handle.h + create mode 100644 ipc/kdbus/item.c + create mode 100644 ipc/kdbus/item.h + create mode 100644 ipc/kdbus/limits.h + create mode 100644 ipc/kdbus/main.c + create mode 100644 ipc/kdbus/match.c + create mode 100644 ipc/kdbus/match.h + create mode 100644 ipc/kdbus/message.c + create mode 100644 ipc/kdbus/message.h + create mode 100644 ipc/kdbus/metadata.c + create mode 100644 ipc/kdbus/metadata.h + create mode 100644 ipc/kdbus/names.c + create mode 100644 ipc/kdbus/names.h + create mode 100644 ipc/kdbus/node.c + create mode 100644 ipc/kdbus/node.h + create mode 100644 ipc/kdbus/notify.c + create mode 100644 ipc/kdbus/notify.h + create mode 100644 ipc/kdbus/policy.c + create mode 100644 ipc/kdbus/policy.h + create mode 100644 ipc/kdbus/pool.c + create mode 100644 ipc/kdbus/pool.h + create mode 100644 ipc/kdbus/queue.c + create mode 100644 ipc/kdbus/queue.h + create mode 100644 ipc/kdbus/reply.c + create mode 100644 ipc/kdbus/reply.h + create mode 100644 ipc/kdbus/util.c + create mode 100644 ipc/kdbus/util.h + create mode 100644 samples/kdbus/.gitignore + create mode 100644 samples/kdbus/Makefile + create mode 100644 samples/kdbus/kdbus-api.h + create mode 100644 samples/kdbus/kdbus-workers.c + create mode 100644 tools/testing/selftests/kdbus/.gitignore + create mode 100644 tools/testing/selftests/kdbus/Makefile + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c + create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h + create mode 100644 tools/testing/selftests/kdbus/test-activator.c + create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c + create mode 100644 tools/testing/selftests/kdbus/test-bus.c + create mode 100644 tools/testing/selftests/kdbus/test-chat.c + create mode 100644 tools/testing/selftests/kdbus/test-connection.c + create mode 100644 tools/testing/selftests/kdbus/test-daemon.c + create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c + create mode 100644 tools/testing/selftests/kdbus/test-fd.c + create mode 100644 tools/testing/selftests/kdbus/test-free.c + create mode 100644 tools/testing/selftests/kdbus/test-match.c + create mode 100644 tools/testing/selftests/kdbus/test-message.c + create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-monitor.c + create mode 100644 tools/testing/selftests/kdbus/test-names.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c + create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c + create mode 100644 tools/testing/selftests/kdbus/test-policy.c + create mode 100644 tools/testing/selftests/kdbus/test-sync.c + create mode 100644 tools/testing/selftests/kdbus/test-timeout.c +Merging cgroup/for-next (917d8e2d10f4 cgroup: add documentation for the PIDs controller) +$ git merge cgroup/for-next +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup.c +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + CREDITS | 5 + + Documentation/cgroups/00-INDEX | 2 + + Documentation/cgroups/pids.txt | 85 ++++++++++ + include/linux/cgroup-defs.h | 10 +- + include/linux/cgroup.h | 15 +- + include/linux/cgroup_subsys.h | 28 ++++ + init/Kconfig | 16 ++ + kernel/Makefile | 1 + + kernel/cgroup.c | 73 +++++++- + kernel/cgroup_freezer.c | 2 +- + kernel/cgroup_pids.c | 366 +++++++++++++++++++++++++++++++++++++++++ + kernel/fork.c | 17 +- + kernel/sched/core.c | 2 +- + 13 files changed, 613 insertions(+), 9 deletions(-) + create mode 100644 Documentation/cgroups/pids.txt + create mode 100644 kernel/cgroup_pids.c +Merging scsi/for-next (1278dd6809b1 scsi: fix host max depth checking for the 'queue_depth' sysfs interface) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (f8d2b3fdf5fe tcm_loop: Send I_T_NEXUS_LOSS_OCCURRED UA) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/scsi_common.c | 98 ++++++++ + drivers/scsi/scsi_error.c | 99 +------- + drivers/target/loopback/tcm_loop.c | 22 +- + drivers/target/target_core_device.c | 2 +- + drivers/target/target_core_sbc.c | 10 +- + drivers/target/target_core_spc.c | 31 +-- + drivers/target/target_core_tpg.c | 17 ++ + drivers/target/target_core_transport.c | 399 ++++++++++++--------------------- + include/scsi/scsi_common.h | 5 + + include/scsi/scsi_eh.h | 7 +- + include/target/target_core_base.h | 8 +- + include/target/target_core_fabric.h | 1 + + 12 files changed, 295 insertions(+), 404 deletions(-) +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (70a7954868b9 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 5 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 20 +- + arch/arm/boot/dts/ste-href-ab8500.dtsi | 4 - + drivers/Makefile | 2 +- + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 7 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 + + drivers/pinctrl/devicetree.c | 8 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 6 +- + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 323 ++++ + drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 - + drivers/pinctrl/pinctrl-adi2-bf60x.c | 8 +- + drivers/pinctrl/pinctrl-single.c | 4 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 284 ++-- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 89 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 5 - + drivers/pinctrl/sh-pfc/core.c | 52 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 4 - + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 21 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 19 +- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 4 - + drivers/pinctrl/sh-pfc/pinctrl.c | 42 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 2 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 1 - + drivers/pinctrl/uniphier/Kconfig | 32 + + drivers/pinctrl/uniphier/Makefile | 8 + + drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c | 886 +++++++++++ + drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c | 1274 ++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c | 1554 ++++++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c | 1346 +++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c | 794 ++++++++++ + drivers/pinctrl/uniphier/pinctrl-proxstream2.c | 1269 ++++++++++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 684 +++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 217 +++ + 36 files changed, 8661 insertions(+), 325 deletions(-) + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx6ul.c + create mode 100644 drivers/pinctrl/uniphier/Kconfig + create mode 100644 drivers/pinctrl/uniphier/Makefile + create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-proxstream2.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier.h +Merging vhost/linux-next (cdf764d59bc6 PCI/MSI: Make pci_msi_shutdown(), pci_msix_shutdown() static) +$ git merge vhost/linux-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'include/uapi/linux/pci_regs.h' using previous resolution. +Auto-merging include/uapi/linux/pci_regs.h +CONFLICT (content): Merge conflict in include/uapi/linux/pci_regs.h +Auto-merging include/linux/pci.h +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/pci/msi.c +CONFLICT (modify/delete): drivers/ntb/ntb_hw.c deleted in HEAD and modified in vhost/linux-next. Version vhost/linux-next of drivers/ntb/ntb_hw.c left in tree. +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/macvtap.c +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/ntb/ntb_hw.c +drivers/ntb/ntb_hw.c: needs merge +rm 'drivers/ntb/ntb_hw.c' +$ git commit -v -a +[master 8f85d4d18b41] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 10 ++++- + drivers/net/macvtap.c | 2 +- + drivers/net/tun.c | 2 +- + drivers/pci/msi.c | 4 +- + drivers/pci/pci-driver.c | 2 - + drivers/s390/Makefile | 2 +- + drivers/s390/{kvm => virtio}/Makefile | 0 + drivers/s390/{kvm => virtio}/kvm_virtio.c | 0 + drivers/s390/{kvm => virtio}/virtio_ccw.c | 0 + drivers/scsi/virtio_scsi.c | 4 +- + drivers/vhost/vhost.c | 67 +++++++++++++++++++++++-------- + include/linux/pci.h | 4 -- + include/uapi/linux/virtio_net.h | 16 ++++++++ + include/uapi/linux/virtio_pci.h | 6 +++ + include/uapi/linux/virtio_ring.h | 5 ++- + net/9p/trans_virtio.c | 1 + + 16 files changed, 95 insertions(+), 30 deletions(-) + rename drivers/s390/{kvm => virtio}/Makefile (100%) + rename drivers/s390/{kvm => virtio}/kvm_virtio.c (100%) + rename drivers/s390/{kvm => virtio}/virtio_ccw.c (100%) +Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (da1c60cf9161 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Removing include/linux/platform_data/gpio-em.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 35 ++- + .../devicetree/bindings/gpio/zx296702-gpio.txt | 24 ++ + drivers/gpio/Kconfig | 8 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-74xx-mmio.c | 2 +- + drivers/gpio/gpio-altera.c | 4 +- + drivers/gpio/gpio-em.c | 34 +-- + drivers/gpio/gpio-generic.c | 18 ++ + drivers/gpio/gpio-pcf857x.c | 14 +- + drivers/gpio/gpio-rcar.c | 20 +- + drivers/gpio/gpio-zx.c | 324 +++++++++++++++++++++ + drivers/gpio/gpio-zynq.c | 6 + + drivers/gpio/gpiolib-of.c | 7 +- + drivers/gpio/gpiolib.c | 10 +- + include/linux/platform_data/gpio-em.h | 11 - + 15 files changed, 450 insertions(+), 68 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/zx296702-gpio.txt + create mode 100644 drivers/gpio/gpio-zx.c + delete mode 100644 include/linux/platform_data/gpio-em.h +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 (361c1066c939 pwm: lpss: pci: Add support for Broxton platform) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (bc0195aad0da Linux 4.2-rc2) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (75509fd88fbd nsfs: Add a show_path method to fix mountinfo) +$ git merge userns/for-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/exec.c | 10 ++++++++-- + fs/namespace.c | 33 +++++++++++++++++++++++++-------- + fs/nsfs.c | 10 ++++++++++ + fs/open.c | 2 +- + fs/proc/root.c | 2 ++ + fs/sysfs/mount.c | 4 ++++ + include/linux/fs.h | 3 +++ + kernel/sys.c | 3 +-- + mm/mmap.c | 4 ++-- + mm/nommu.c | 2 +- + security/security.c | 2 +- + 11 files changed, 58 insertions(+), 17 deletions(-) +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (e6c42abb2c94 clk: ti: make use of of_clk_parent_fill helper function) +$ git merge clk/clk-next +Auto-merging drivers/clocksource/cadence_ttc_timer.c +Auto-merging drivers/clk/ti/dpll44xx.c +Auto-merging drivers/clk/ti/dpll3xxx.c +Auto-merging drivers/clk/ti/clkt_dpll.c +Auto-merging drivers/clk/tegra/clk.c +Auto-merging drivers/clk/tegra/clk-tegra124.c +Auto-merging drivers/clk/tegra/clk-tegra-super-gen4.c +Auto-merging drivers/clk/spear/spear6xx_clock.c +Auto-merging drivers/clk/spear/spear1340_clock.c +Auto-merging drivers/clk/spear/spear1310_clock.c +Auto-merging drivers/clk/samsung/clk-exynos5250.c +Auto-merging drivers/clk/h8300/clk-h8s2678.c +Removing drivers/clk/clk-gpio-gate.c +Auto-merging arch/arm/mach-omap2/io.c +Removing arch/arm/mach-omap2/clock_common_data.c +Removing arch/arm/mach-omap2/clock44xx.h +Removing arch/arm/mach-omap2/clock3xxx.c +Removing arch/arm/mach-omap2/clock36xx.h +Removing arch/arm/mach-omap2/clock36xx.c +Removing arch/arm/mach-omap2/clock3517.h +Removing arch/arm/mach-omap2/clock3517.c +Removing arch/arm/mach-omap2/clock34xx.h +Removing arch/arm/mach-omap2/clock34xx.c +Removing arch/arm/mach-omap2/clock2xxx.c +Removing arch/arm/mach-omap2/clock2430.c +Removing arch/arm/mach-omap2/clkt_iclk.c +Removing arch/arm/mach-omap2/clkt_clksel.c +Auto-merging arch/arm/mach-omap2/Makefile +Merge made by the 'recursive' strategy. + Documentation/clk.txt | 8 +- + .../devicetree/bindings/clock/gpio-mux-clock.txt | 19 + + arch/arm/mach-at91/at91rm9200.c | 1 - + arch/arm/mach-hisi/hisilicon.c | 1 - + arch/arm/mach-keystone/pm_domain.c | 1 - + arch/arm/mach-mvebu/board-v7.c | 1 - + arch/arm/mach-omap2/Makefile | 22 +- + arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 7 +- + arch/arm/mach-omap2/clkt_clksel.c | 466 -------------- + arch/arm/mach-omap2/clkt_iclk.c | 68 --- + arch/arm/mach-omap2/clock.c | 676 +-------------------- + arch/arm/mach-omap2/clock.h | 205 +------ + arch/arm/mach-omap2/clock2430.c | 57 -- + arch/arm/mach-omap2/clock2xxx.c | 57 -- + arch/arm/mach-omap2/clock34xx.c | 138 ----- + arch/arm/mach-omap2/clock34xx.h | 18 - + arch/arm/mach-omap2/clock3517.c | 118 ---- + arch/arm/mach-omap2/clock3517.h | 14 - + arch/arm/mach-omap2/clock36xx.c | 69 --- + arch/arm/mach-omap2/clock36xx.h | 13 - + arch/arm/mach-omap2/clock3xxx.c | 135 ---- + arch/arm/mach-omap2/clock44xx.h | 20 - + arch/arm/mach-omap2/clock_common_data.c | 115 ---- + arch/arm/mach-omap2/io.c | 3 +- + arch/arm/mach-omap2/omap_hwmod.c | 1 + + arch/arm/mach-omap2/pm24xx.c | 1 + + arch/arm/mach-orion5x/board-dt.c | 1 - + arch/arm/mach-s3c64xx/common.c | 1 - + arch/arm64/kernel/setup.c | 1 - + arch/mips/alchemy/common/clock.c | 66 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 1 + + drivers/acpi/acpi_apd.c | 1 - + drivers/acpi/acpi_lpss.c | 1 - + drivers/clk/Makefile | 2 +- + drivers/clk/at91/clk-main.c | 7 +- + drivers/clk/at91/clk-master.c | 7 +- + drivers/clk/at91/clk-programmable.c | 32 +- + drivers/clk/at91/clk-slow.c | 16 +- + drivers/clk/at91/clk-smd.c | 7 +- + drivers/clk/at91/clk-usb.c | 35 +- + drivers/clk/at91/pmc.h | 124 ++-- + drivers/clk/bcm/clk-kona.c | 35 +- + drivers/clk/clk-axi-clkgen.c | 1 - + drivers/clk/clk-cdce706.c | 1 + + drivers/clk/clk-cdce925.c | 1 + + drivers/clk/clk-clps711x.c | 1 - + drivers/clk/clk-composite.c | 49 +- + drivers/clk/clk-efm32gg.c | 1 - + drivers/clk/clk-gpio-gate.c | 207 ------- + drivers/clk/clk-gpio.c | 324 ++++++++++ + drivers/clk/clk-highbank.c | 1 + + drivers/clk/clk-moxart.c | 1 + + drivers/clk/clk-mux.c | 1 - + drivers/clk/clk-nomadik.c | 3 +- + drivers/clk/clk-palmas.c | 1 - + drivers/clk/clk-rk808.c | 1 - + drivers/clk/clk-s2mps11.c | 14 +- + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-si570.c | 1 + + drivers/clk/clk-twl6040.c | 13 +- + drivers/clk/clk-u300.c | 2 +- + drivers/clk/clk-wm831x.c | 1 - + drivers/clk/clk-xgene.c | 28 +- + drivers/clk/clk.c | 210 ++++--- + drivers/clk/h8300/clk-div.c | 4 +- + drivers/clk/h8300/clk-h8s2678.c | 20 +- + drivers/clk/hisilicon/clk-hi3620.c | 41 +- + drivers/clk/hisilicon/clk-hip04.c | 2 - + drivers/clk/hisilicon/clk.c | 3 +- + drivers/clk/hisilicon/clkgate-separated.c | 2 - + drivers/clk/imx/clk-imx1.c | 1 - + drivers/clk/imx/clk-imx21.c | 1 - + drivers/clk/imx/clk-pfd.c | 1 - + drivers/clk/imx/clk-pllv1.c | 1 - + drivers/clk/imx/clk-pllv3.c | 1 - + drivers/clk/ingenic/cgu.c | 1 + + drivers/clk/keystone/gate.c | 1 - + drivers/clk/keystone/pll.c | 4 +- + drivers/clk/mediatek/clk-gate.h | 3 +- + drivers/clk/mediatek/clk-mt8135.c | 1 + + drivers/clk/mediatek/clk-mt8173.c | 25 +- + drivers/clk/mediatek/clk-mtk.h | 9 +- + drivers/clk/mediatek/clk-pll.c | 39 +- + drivers/clk/meson/clk-cpu.c | 1 + + drivers/clk/meson/clkc.c | 1 - + drivers/clk/mmp/clk-apbc.c | 1 - + drivers/clk/mmp/clk-apmu.c | 1 - + drivers/clk/mmp/clk-mix.c | 23 +- + drivers/clk/mmp/clk.c | 3 +- + drivers/clk/mvebu/clk-cpu.c | 3 +- + drivers/clk/mvebu/common.c | 2 +- + drivers/clk/mxs/clk-div.c | 1 - + drivers/clk/mxs/clk-frac.c | 1 - + drivers/clk/mxs/clk-imx23.c | 3 +- + drivers/clk/mxs/clk-imx28.c | 2 +- + drivers/clk/mxs/clk-pll.c | 1 - + drivers/clk/mxs/clk-ref.c | 1 - + drivers/clk/mxs/clk.h | 3 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - + drivers/clk/pistachio/clk.c | 1 + + drivers/clk/qcom/clk-pll.c | 93 ++- + drivers/clk/qcom/clk-pll.h | 1 + + drivers/clk/qcom/clk-rcg.c | 44 +- + drivers/clk/qcom/clk-rcg2.c | 78 +-- + drivers/clk/qcom/gcc-apq8084.c | 13 +- + drivers/clk/qcom/gcc-ipq806x.c | 10 +- + drivers/clk/qcom/gcc-msm8660.c | 8 +- + drivers/clk/qcom/gcc-msm8916.c | 24 +- + drivers/clk/qcom/gcc-msm8960.c | 12 +- + drivers/clk/qcom/gcc-msm8974.c | 5 +- + drivers/clk/qcom/lcc-ipq806x.c | 6 +- + drivers/clk/qcom/lcc-msm8960.c | 8 +- + drivers/clk/qcom/mmcc-apq8084.c | 20 +- + drivers/clk/qcom/mmcc-msm8960.c | 15 +- + drivers/clk/qcom/mmcc-msm8974.c | 16 +- + drivers/clk/rockchip/clk-cpu.c | 1 + + drivers/clk/rockchip/clk-mmc-phase.c | 1 + + drivers/clk/rockchip/clk-pll.c | 1 - + drivers/clk/rockchip/clk-rk3188.c | 1 + + drivers/clk/rockchip/clk.h | 4 +- + drivers/clk/samsung/clk-cpu.c | 3 + + drivers/clk/samsung/clk-exynos-audss.c | 3 +- + drivers/clk/samsung/clk-exynos-clkout.c | 2 +- + drivers/clk/samsung/clk-exynos3250.c | 2 - + drivers/clk/samsung/clk-exynos4.c | 2 +- + drivers/clk/samsung/clk-exynos4415.c | 2 - + drivers/clk/samsung/clk-exynos5250.c | 2 - + drivers/clk/samsung/clk-exynos5260.c | 2 - + drivers/clk/samsung/clk-exynos5410.c | 2 - + drivers/clk/samsung/clk-exynos5420.c | 3 +- + drivers/clk/samsung/clk-exynos5433.c | 2 - + drivers/clk/samsung/clk-exynos5440.c | 2 - + drivers/clk/samsung/clk-exynos7.c | 2 - + drivers/clk/samsung/clk-pll.c | 2 + + drivers/clk/samsung/clk-s3c2410-dclk.c | 4 + + drivers/clk/samsung/clk-s3c2410.c | 2 - + drivers/clk/samsung/clk-s3c2412.c | 2 - + drivers/clk/samsung/clk-s3c2443.c | 2 - + drivers/clk/samsung/clk-s3c64xx.c | 3 +- + drivers/clk/samsung/clk-s5pv210-audss.c | 2 +- + drivers/clk/samsung/clk-s5pv210.c | 2 - + drivers/clk/samsung/clk.c | 4 + + drivers/clk/samsung/clk.h | 3 +- + drivers/clk/shmobile/clk-div6.c | 2 +- + drivers/clk/shmobile/clk-r8a73a4.c | 2 +- + drivers/clk/shmobile/clk-r8a7740.c | 2 +- + drivers/clk/shmobile/clk-r8a7778.c | 2 +- + drivers/clk/shmobile/clk-r8a7779.c | 2 +- + drivers/clk/shmobile/clk-rcar-gen2.c | 2 +- + drivers/clk/shmobile/clk-sh73a0.c | 2 +- + drivers/clk/sirf/clk-atlas6.c | 1 - + drivers/clk/sirf/clk-common.c | 2 + + drivers/clk/sirf/clk-prima2.c | 1 - + drivers/clk/socfpga/clk-gate-a10.c | 1 + + drivers/clk/socfpga/clk-gate.c | 3 +- + drivers/clk/socfpga/clk-periph-a10.c | 1 + + drivers/clk/socfpga/clk-periph.c | 3 +- + drivers/clk/socfpga/clk-pll-a10.c | 1 + + drivers/clk/socfpga/clk-pll.c | 3 +- + drivers/clk/socfpga/clk.h | 1 - + drivers/clk/spear/spear1310_clock.c | 1 - + drivers/clk/spear/spear1340_clock.c | 1 - + drivers/clk/spear/spear6xx_clock.c | 1 - + drivers/clk/st/clk-flexgen.c | 7 +- + drivers/clk/st/clkgen-fsyn.c | 1 + + drivers/clk/st/clkgen-mux.c | 91 +-- + drivers/clk/st/clkgen-pll.c | 1 + + drivers/clk/sunxi/clk-a20-gmac.c | 4 +- + drivers/clk/sunxi/clk-factors.c | 29 +- + drivers/clk/sunxi/clk-mod0.c | 3 +- + drivers/clk/sunxi/clk-sun6i-ar100.c | 28 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 2 +- + drivers/clk/sunxi/clk-sun9i-core.c | 2 +- + drivers/clk/sunxi/clk-sun9i-mmc.c | 3 +- + drivers/clk/sunxi/clk-sunxi.c | 36 +- + drivers/clk/sunxi/clk-usb.c | 3 +- + drivers/clk/tegra/clk-divider.c | 1 - + drivers/clk/tegra/clk-emc.c | 28 +- + drivers/clk/tegra/clk-periph-gate.c | 1 - + drivers/clk/tegra/clk-periph.c | 1 - + drivers/clk/tegra/clk-pll-out.c | 1 - + drivers/clk/tegra/clk-pll.c | 2 +- + drivers/clk/tegra/clk-super.c | 1 - + drivers/clk/tegra/clk-tegra-audio.c | 1 - + drivers/clk/tegra/clk-tegra-fixed.c | 1 - + drivers/clk/tegra/clk-tegra-periph.c | 1 - + drivers/clk/tegra/clk-tegra-pmc.c | 1 - + drivers/clk/tegra/clk-tegra-super-gen4.c | 1 - + drivers/clk/tegra/clk-tegra114.c | 2 - + drivers/clk/tegra/clk-tegra124.c | 1 - + drivers/clk/tegra/clk-tegra20.c | 1 - + drivers/clk/tegra/clk-tegra30.c | 1 - + drivers/clk/tegra/clk.c | 1 + + drivers/clk/ti/Makefile | 17 +- + drivers/clk/ti/apll.c | 7 +- + drivers/clk/ti/autoidle.c | 121 +++- + drivers/clk/ti/clk-2xxx.c | 4 +- + drivers/clk/ti/clk-33xx.c | 3 + + drivers/clk/ti/clk-3xxx-legacy.c | 1 + + drivers/clk/ti/clk-3xxx.c | 235 +++++++ + drivers/clk/ti/clk-43xx.c | 3 + + drivers/clk/ti/clk-44xx.c | 2 + + drivers/clk/ti/clk-54xx.c | 2 + + drivers/clk/ti/clk-7xx.c | 3 +- + drivers/clk/ti/clk-816x.c | 2 + + drivers/clk/ti/clk-dra7-atl.c | 1 + + drivers/clk/ti/clk.c | 150 ++++- + drivers/clk/ti/clkt_dflt.c | 316 ++++++++++ + .../arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c | 27 +- + drivers/clk/ti/clkt_iclk.c | 101 +++ + drivers/clk/ti/clock.h | 105 ++++ + drivers/clk/ti/clockdomain.c | 79 +++ + drivers/clk/ti/composite.c | 4 +- + drivers/clk/ti/dpll.c | 5 +- + {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c | 186 +++--- + {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c | 53 +- + drivers/clk/ti/fapll.c | 4 +- + drivers/clk/ti/fixed-factor.c | 2 + + drivers/clk/ti/mux.c | 4 +- + drivers/clk/ux500/abx500-clk.c | 1 - + drivers/clk/ux500/clk.h | 3 +- + drivers/clk/ux500/u8500_clk.c | 1 - + drivers/clk/ux500/u8500_of_clk.c | 2 - + drivers/clk/ux500/u8540_clk.c | 1 - + drivers/clk/ux500/u9540_clk.c | 2 - + drivers/clk/versatile/clk-icst.c | 5 +- + drivers/clk/versatile/clk-impd1.c | 1 - + drivers/clk/versatile/clk-realview.c | 1 - + drivers/clk/versatile/clk-sp810.c | 3 +- + drivers/clk/versatile/clk-versatile.c | 2 - + drivers/clk/zynq/clkc.c | 1 + + drivers/clocksource/cadence_ttc_timer.c | 1 - + .../clocking-wizard/clk-xlnx-clock-wizard.c | 1 + + drivers/video/fbdev/simplefb.c | 1 + + include/linux/clk-provider.h | 70 ++- + include/linux/clk/tegra.h | 3 +- + include/linux/clk/ti.h | 157 ++--- + lib/vsprintf.c | 1 + + 238 files changed, 2577 insertions(+), 3467 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/gpio-mux-clock.txt + delete mode 100644 arch/arm/mach-omap2/clkt_clksel.c + delete mode 100644 arch/arm/mach-omap2/clkt_iclk.c + delete mode 100644 arch/arm/mach-omap2/clock2430.c + delete mode 100644 arch/arm/mach-omap2/clock2xxx.c + delete mode 100644 arch/arm/mach-omap2/clock34xx.c + delete mode 100644 arch/arm/mach-omap2/clock34xx.h + delete mode 100644 arch/arm/mach-omap2/clock3517.c + delete mode 100644 arch/arm/mach-omap2/clock3517.h + delete mode 100644 arch/arm/mach-omap2/clock36xx.c + delete mode 100644 arch/arm/mach-omap2/clock36xx.h + delete mode 100644 arch/arm/mach-omap2/clock3xxx.c + delete mode 100644 arch/arm/mach-omap2/clock44xx.h + delete mode 100644 arch/arm/mach-omap2/clock_common_data.c + delete mode 100644 drivers/clk/clk-gpio-gate.c + create mode 100644 drivers/clk/clk-gpio.c + create mode 100644 drivers/clk/ti/clkt_dflt.c + rename {arch/arm/mach-omap2 => drivers/clk/ti}/clkt_dpll.c (94%) + create mode 100644 drivers/clk/ti/clkt_iclk.c + rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll3xxx.c (82%) + rename {arch/arm/mach-omap2 => drivers/clk/ti}/dpll44xx.c (80%) +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (d770e558e219 Linux 4.2-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7b47cb07cfde] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +- + drivers/staging/ft1000/ft1000.h | 4 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +++--- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++---------- + drivers/staging/media/lirc/lirc_sasem.c | 20 +++++----- + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++---------------- + fs/coredump.c | 8 ++-- + kernel/cpuset.c | 12 ++++-- + 11 files changed, 68 insertions(+), 90 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5) +$ git merge access_once/linux-next +Already up-to-date. +Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + kernel/livepatch/core.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging coresight/next (32c00c927e05 Doc: trace: Fix typo in coresight.txt) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 2 +- + .../devicetree/bindings/arm/coresight.txt | 1 + + Documentation/trace/coresight.txt | 4 +-- + drivers/hwtracing/coresight/coresight-etm.h | 7 ++-- + drivers/hwtracing/coresight/coresight-etm3x.c | 33 ++++++++++++------- + drivers/hwtracing/coresight/coresight-etm4x.c | 37 ++++++++++++++-------- + drivers/hwtracing/coresight/coresight-etm4x.h | 7 ++-- + drivers/hwtracing/coresight/coresight-replicator.c | 13 +------- + include/linux/coresight.h | 20 ++++++++++++ + 10 files changed, 81 insertions(+), 45 deletions(-) +Merging rtc/rtc-next (a876e499eca8 rtc: Drop owner assignment from platform_driver) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/rtc-88pm80x.c | 28 +++++++----- + drivers/rtc/rtc-ab-b5ze-s3.c | 1 - + drivers/rtc/rtc-bq32k.c | 3 +- + drivers/rtc/rtc-ds1307.c | 106 +++++++++++++++++++++++-------------------- + drivers/rtc/rtc-ds1374.c | 1 - + drivers/rtc/rtc-ds1685.c | 22 +-------- + drivers/rtc/rtc-ds3232.c | 1 - + drivers/rtc/rtc-fm3130.c | 1 - + drivers/rtc/rtc-hym8563.c | 1 - + drivers/rtc/rtc-isl12022.c | 7 +-- + drivers/rtc/rtc-isl12057.c | 1 - + drivers/rtc/rtc-opal.c | 1 - + drivers/rtc/rtc-pcf2123.c | 8 +--- + drivers/rtc/rtc-pcf2127.c | 35 +++++++++----- + drivers/rtc/rtc-pcf85063.c | 1 - + drivers/rtc/rtc-pcf8523.c | 1 - + drivers/rtc/rtc-pcf8563.c | 1 - + drivers/rtc/rtc-pcf8583.c | 1 - + drivers/rtc/rtc-rx8025.c | 1 - + drivers/rtc/rtc-rx8581.c | 1 - + 20 files changed, 101 insertions(+), 121 deletions(-) +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 (f0f2c072cf53 nfit: add support for NVDIMM "latch" flag) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +$ git am -3 ../patches/0001-ASoC-sti-included-needed-header-file.patch +Applying: ASoC: sti: included needed header file +Merging akpm-current/current (76fb8073bdaf ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'arch/arm/include/asm/Kbuild' +Recorded preimage for 'arch/cris/include/asm/Kbuild' +Recorded preimage for 'arch/x86/Kconfig' +Recorded preimage for 'fs/notify/mark.c' +Resolved 'arch/cris/arch-v10/kernel/entry.S' using previous resolution. +Resolved 'arch/cris/arch-v32/kernel/entry.S' using previous resolution. +Auto-merging scripts/kernel-doc +Auto-merging scripts/checkpatch.pl +Auto-merging mm/page_alloc.c +Auto-merging mm/nommu.c +Auto-merging mm/mmap.c +Auto-merging lib/vsprintf.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/Kbuild +Auto-merging include/linux/sched.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/fs.h +Auto-merging fs/proc/base.c +Auto-merging fs/notify/mark.c +CONFLICT (content): Merge conflict in fs/notify/mark.c +Auto-merging fs/namespace.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging block/genhd.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging arch/cris/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild +Auto-merging arch/cris/arch-v32/kernel/entry.S +CONFLICT (content): Merge conflict in arch/cris/arch-v32/kernel/entry.S +Auto-merging arch/cris/arch-v10/kernel/entry.S +CONFLICT (content): Merge conflict in arch/cris/arch-v10/kernel/entry.S +Auto-merging arch/arm/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/arm/include/asm/Kbuild +Auto-merging Documentation/ioctl/ioctl-number.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/include/asm/Kbuild'. +Recorded resolution for 'arch/cris/include/asm/Kbuild'. +Recorded resolution for 'arch/x86/Kconfig'. +Recorded resolution for 'fs/notify/mark.c'. +[master c916f6b7f520] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/blockdev/zram.txt | 3 +- + Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 +- + Documentation/features/vm/TLB/arch-support.txt | 40 + + Documentation/filesystems/dax.txt | 7 +- + Documentation/filesystems/proc.txt | 18 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/printk-formats.txt | 8 + + Documentation/sysrq.txt | 3 +- + Documentation/vm/pagemap.txt | 15 +- + Documentation/vm/userfaultfd.txt | 144 +++ + Documentation/w1/masters/omap-hdq | 6 + + arch/alpha/include/asm/unistd.h | 2 +- + arch/alpha/include/uapi/asm/mman.h | 6 + + arch/alpha/kernel/systbls.S | 3 + + arch/arm/include/asm/pgtable-3level.h | 1 + + arch/arm/include/asm/unistd.h | 2 +- + arch/arm/kernel/calls.S | 3 + + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-imx/pm-imx5.c | 2 +- + arch/arm/mach-imx/pm-imx6.c | 2 +- + arch/arm/mach-socfpga/pm.c | 2 +- + arch/arm64/include/asm/pgtable.h | 2 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 + + arch/avr32/kernel/syscall_table.S | 3 + + arch/blackfin/mach-common/entry.S | 3 + + arch/cris/arch-v10/kernel/entry.S | 3 + + arch/cris/arch-v32/kernel/entry.S | 3 + + arch/frv/kernel/entry.S | 3 + + arch/ia64/kernel/entry.S | 3 + + arch/m32r/kernel/entry.S | 3 + + arch/m32r/kernel/syscall_table.S | 3 + + arch/m68k/kernel/syscalltable.S | 3 + + arch/microblaze/kernel/syscall_table.S | 3 + + arch/mips/include/uapi/asm/mman.h | 9 + + arch/mips/kernel/scall32-o32.S | 3 + + arch/mips/kernel/scall64-64.S | 3 + + arch/mips/kernel/scall64-n32.S | 3 + + arch/mips/kernel/scall64-o32.S | 3 + + arch/mn10300/kernel/entry.S | 3 + + arch/parisc/include/uapi/asm/mman.h | 6 + + arch/powerpc/include/asm/pgtable-ppc64.h | 2 + + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/mman.h | 5 + + arch/powerpc/include/uapi/asm/unistd.h | 1 + + arch/sh/kernel/syscalls_32.S | 3 + + arch/sparc/include/asm/pgtable_64.h | 9 + + arch/sparc/include/uapi/asm/mman.h | 5 + + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/tile/include/uapi/asm/mman.h | 8 + + arch/x86/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 4 + + arch/x86/entry/syscalls/syscall_64.tbl | 4 + + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/include/asm/tlbflush.h | 6 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/tlb.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 9 + + arch/xtensa/include/uapi/asm/unistd.h | 10 +- + block/genhd.c | 2 +- + drivers/block/zram/zram_drv.c | 15 +- + drivers/block/zram/zram_drv.h | 1 - + .../crypto/qat/qat_common/adf_transport_debug.c | 16 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/misc/sram.c | 8 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 35 +- + drivers/parisc/ccio-dma.c | 13 +- + drivers/parisc/sba_iommu.c | 9 +- + drivers/s390/crypto/zcrypt_api.c | 10 +- + drivers/tty/sysrq.c | 11 +- + drivers/w1/masters/omap_hdq.c | 224 +++- + fs/Makefile | 1 + + fs/affs/super.c | 8 +- + fs/aio.c | 25 +- + fs/binfmt_misc.c | 12 +- + fs/block_dev.c | 1 + + fs/cachefiles/daemon.c | 84 +- + fs/cifs/file.c | 8 +- + fs/dax.c | 152 +++ + fs/dcache.c | 15 +- + fs/ext2/file.c | 10 +- + fs/ext2/inode.c | 1 + + fs/ext2/super.c | 6 +- + fs/ext3/super.c | 7 +- + fs/ext4/file.c | 11 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/indirect.c | 1 + + fs/ext4/inode.c | 1 + + fs/ext4/super.c | 15 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 + + fs/fat/inode.c | 75 +- + fs/file_table.c | 24 +- + fs/hfs/bnode.c | 9 +- + fs/hfs/brec.c | 20 +- + fs/hfsplus/bnode.c | 3 - + fs/inode.c | 2 +- + fs/libfs.c | 26 +- + fs/mpage.c | 23 +- + fs/namespace.c | 4 +- + fs/notify/fdinfo.c | 3 +- + fs/notify/fsnotify.c | 10 + + fs/notify/mark.c | 26 +- + fs/ntfs/super.c | 21 +- + fs/ocfs2/acl.c | 26 +- + fs/ocfs2/alloc.c | 245 ++-- + fs/ocfs2/aops.c | 54 +- + fs/ocfs2/buffer_head_io.c | 6 + + fs/ocfs2/cluster/heartbeat.c | 103 +- + fs/ocfs2/cluster/nodemanager.c | 50 +- + fs/ocfs2/dir.c | 70 +- + fs/ocfs2/dlm/dlmmaster.c | 22 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/dlmglue.c | 10 +- + fs/ocfs2/extent_map.c | 22 +- + fs/ocfs2/file.c | 16 +- + fs/ocfs2/inode.c | 49 +- + fs/ocfs2/inode.h | 2 - + fs/ocfs2/journal.c | 32 +- + fs/ocfs2/localalloc.c | 3 +- + fs/ocfs2/move_extents.c | 8 +- + fs/ocfs2/namei.c | 66 +- + fs/ocfs2/ocfs2.h | 2 + + fs/ocfs2/quota_local.c | 3 +- + fs/ocfs2/refcounttree.c | 81 +- + fs/ocfs2/stack_user.c | 50 +- + fs/ocfs2/suballoc.c | 90 +- + fs/ocfs2/super.c | 69 +- + fs/ocfs2/super.h | 8 +- + fs/ocfs2/xattr.c | 51 +- + fs/proc/array.c | 5 +- + fs/proc/base.c | 43 +- + fs/proc/task_mmu.c | 288 ++--- + fs/seq_file.c | 42 + + fs/userfaultfd.c | 1330 ++++++++++++++++++++ + fs/xfs/xfs_buf.h | 1 + + fs/xfs/xfs_file.c | 30 +- + fs/xfs/xfs_trace.h | 1 + + include/linux/crc64_ecma.h | 56 + + include/linux/cred.h | 8 + + include/linux/dax.h | 39 + + include/linux/fs.h | 20 +- + include/linux/genalloc.h | 6 +- + include/linux/gfp.h | 5 +- + include/linux/huge_mm.h | 27 +- + include/linux/kallsyms.h | 10 +- + include/linux/kernel.h | 129 +- + include/linux/kexec.h | 2 + + include/linux/kthread.h | 2 +- + include/linux/memcontrol.h | 388 +++++- + include/linux/mm.h | 65 +- + include/linux/mm_types.h | 12 + + include/linux/mman.h | 3 +- + include/linux/mmzone.h | 8 - + include/linux/module.h | 19 +- + include/linux/oom.h | 38 +- + include/linux/page-flags.h | 237 ++-- + include/linux/pagemap.h | 25 +- + include/linux/parse-integer.h | 188 +++ + include/linux/poison.h | 4 + + include/linux/rmap.h | 12 +- + include/linux/sched.h | 23 + + include/linux/seq_file.h | 4 + + include/linux/slab.h | 10 + + include/linux/smpboot.h | 11 +- + include/linux/string.h | 1 + + include/linux/swap.h | 22 +- + include/linux/syscalls.h | 5 + + include/linux/userfaultfd_k.h | 85 ++ + include/linux/vm_event_item.h | 1 + + include/linux/wait.h | 5 +- + include/linux/zbud.h | 2 +- + include/linux/zpool.h | 4 +- + include/linux/zsmalloc.h | 6 + + include/net/sock.h | 28 - + include/trace/events/tlb.h | 3 +- + include/uapi/asm-generic/mman-common.h | 1 + + include/uapi/asm-generic/mman.h | 5 + + include/uapi/asm-generic/unistd.h | 8 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/prctl.h | 7 + + include/uapi/linux/securebits.h | 11 +- + include/uapi/linux/userfaultfd.h | 169 +++ + init/Kconfig | 21 + + init/main.c | 2 +- + ipc/mqueue.c | 5 - + ipc/msg.c | 5 +- + ipc/msgutil.c | 2 +- + ipc/shm.c | 4 +- + kernel/fork.c | 3 +- + kernel/kallsyms.c | 4 +- + kernel/kthread.c | 7 +- + kernel/module.c | 13 +- + kernel/sched/wait.c | 7 +- + kernel/smpboot.c | 27 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 10 +- + kernel/user_namespace.c | 1 + + kernel/watchdog.c | 15 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 3 + + lib/Makefile | 3 + + lib/bitmap.c | 43 +- + lib/cmdline.c | 44 +- + lib/crc64_ecma.c | 341 +++++ + lib/genalloc.c | 100 +- + lib/kstrtox.c | 254 ---- + lib/kstrtox.h | 1 - + lib/parse-integer.c | 222 ++++ + lib/parser.c | 33 +- + lib/swiotlb.c | 2 +- + lib/test-kstrtox.c | 6 +- + lib/test-parse-integer.c | 563 +++++++++ + lib/vsprintf.c | 101 +- + mm/Makefile | 1 + + mm/compaction.c | 32 +- + mm/dmapool.c | 5 +- + mm/filemap.c | 49 +- + mm/gup.c | 60 +- + mm/huge_memory.c | 210 +++- + mm/hugetlb.c | 18 +- + mm/internal.h | 15 + + mm/kmemleak.c | 21 +- + mm/ksm.c | 2 +- + mm/madvise.c | 185 ++- + mm/memblock.c | 4 + + mm/memcontrol.c | 421 +------ + mm/memory-failure.c | 4 +- + mm/memory.c | 66 +- + mm/memory_hotplug.c | 11 +- + mm/mempolicy.c | 4 +- + mm/mempool.c | 3 + + mm/memtest.c | 23 +- + mm/migrate.c | 20 +- + mm/mlock.c | 138 +- + mm/mmap.c | 60 +- + mm/mprotect.c | 3 +- + mm/mremap.c | 50 +- + mm/nommu.c | 6 + + mm/oom_kill.c | 142 +-- + mm/page_alloc.c | 70 +- + mm/page_isolation.c | 7 +- + mm/rmap.c | 164 ++- + mm/shmem.c | 18 +- + mm/slab.c | 13 + + mm/slab.h | 9 + + mm/slab_common.c | 28 +- + mm/slob.c | 13 + + mm/slub.c | 204 ++- + mm/swap.c | 47 +- + mm/swap_state.c | 41 +- + mm/swapfile.c | 42 + + mm/userfaultfd.c | 308 +++++ + mm/util.c | 40 +- + mm/vmscan.c | 170 ++- + mm/vmstat.c | 1 + + mm/zbud.c | 10 +- + mm/zpool.c | 4 +- + mm/zsmalloc.c | 237 ++-- + mm/zswap.c | 75 +- + net/sunrpc/sched.c | 2 +- + scripts/Lindent | 3 + + scripts/checkpatch.pl | 90 +- + scripts/kernel-doc | 38 +- + scripts/spelling.txt | 4 + + security/commoncap.c | 103 +- + security/keys/process_keys.c | 1 + + tools/testing/selftests/vm/Makefile | 5 + + tools/testing/selftests/vm/lock-on-fault.c | 342 +++++ + tools/testing/selftests/vm/on-fault-limit.c | 47 + + tools/testing/selftests/vm/run_vmtests | 33 + + tools/testing/selftests/vm/userfaultfd.c | 636 ++++++++++ + tools/vm/page-types.c | 35 +- + 278 files changed, 9409 insertions(+), 2983 deletions(-) + create mode 100644 Documentation/features/vm/TLB/arch-support.txt + create mode 100644 Documentation/vm/userfaultfd.txt + create mode 100644 fs/userfaultfd.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/dax.h + create mode 100644 include/linux/parse-integer.h + create mode 100644 include/linux/userfaultfd_k.h + create mode 100644 include/uapi/linux/userfaultfd.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/parse-integer.c + create mode 100644 lib/test-parse-integer.c + create mode 100644 mm/userfaultfd.c + create mode 100644 tools/testing/selftests/vm/lock-on-fault.c + create mode 100644 tools/testing/selftests/vm/on-fault-limit.c + create mode 100644 tools/testing/selftests/vm/userfaultfd.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/gpu/drm/i915/intel_sprite.c: fix build +Applying: drivers/gpu/drm/i915/intel_tv.c: fix build +Applying: net/netfilter/ipset: work around gcc-4.4.4 initializer bug +Applying: sound/soc/codecs/cs4349.c: include gpio/consumer.h +Applying: namei: fix warning while make xmldocs caused by namei.c +Applying: fs/seq_file: convert int seq_vprint/seq_printf/etc... returns to void +Applying: fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void-fix +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 706e60d6ff2c...4a425eb2d969 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (4a425eb2d969 drivers/w1/w1_int.c: call put_device if device_register fails) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_sprite.c | 2 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/w1/w1_int.c | 3 +- + fs/namei.c | 2 +- + fs/nsfs.c | 3 +- + fs/seq_file.c | 70 ++++++++++++---------------- + include/linux/seq_file.h | 19 ++++---- + net/netfilter/ipset/ip_set_hash_netnet.c | 10 +++- + net/netfilter/ipset/ip_set_hash_netportnet.c | 10 +++- + sound/soc/codecs/cs4349.c | 1 + + 10 files changed, 64 insertions(+), 58 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..2d776773c02d --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,13 @@ +Importing jdelvare-hwmon based on 4.2-rc2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard bc0195aad0daa2ad5b0d76cce22b167bc3435590 +HEAD is now at bc0195aad0da Linux 4.2-rc2 +$ git am --patch-format=mbox ../quilt/jdelvare-hwmon/hwmon-k10temp-remove-duplicate-pci-id-define.patch +Applying: hwmon: (k10temp) Remove duplicate pci-id define +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + 1dc51b828800..902fd32b7711 master -> jdelvare-hwmon/master +Importing dmi based on 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..060289e202eb --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20150720 |