diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-03 19:51:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-03 19:51:33 +0100 |
| commit | 9ae4363449141cb286aceeceb6e8b604ff185301 (patch) | |
| tree | aab9bfe14c9640992e17052dbb0e483e2aa38055 | |
| parent | c34c3b643adaa4f6cca986da03daf75878dd75c9 (diff) | |
Add linux-next specific files for 20140903next-20140903
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | Next/SHA1s | 214 | ||||
| -rw-r--r-- | Next/Trees | 215 | ||||
| -rw-r--r-- | Next/merge.log | 4590 | ||||
| -rw-r--r-- | Next/quilt-import.log | 227 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5247 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..feff05aa3235 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,214 @@ +Name SHA1 +---- ---- +origin 7505ceaf863590b24a4c0c83b64817d26e0d51e3 +fixes 23cf8d3ca0fd2cabd0e441fe09a4e8c58b9a0563 +kbuild-current 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arc-current 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd +arm-current eba1c71819d210f5e0d522571f9b8abce94fe9c5 +m68k-current 4ed7800987b1b082f8fc98c5cb7eb20cf74280a8 +metag-fixes ffe6902b66aaa4ca6694bc19639259c16d84ddb1 +powerpc-merge 396a34340cdf7373c00e3977db27d1a20ea65ebc +sparc 451fd72219dd6f3355e2d036c598544c760ee532 +net bec6bfb2437f4676dbaaacba6019e9dafef18962 +ipsec 2d39d120781a5770573dc6ed672a5a562f541aea +sound-current acf08081adb5e8fe0519eb97bb49797ef52614d6 +pci-current 8d7004a6904cf089e0ebfe5a27e9674cee5db9dc +wireless c66517165610b911e4c6d268f28d8c640832dbd1 +driver-core.current 69e273c0b0a3c337a521d083374c918dc52c666f +tty.current 69e273c0b0a3c337a521d083374c918dc52c666f +usb.current 69e273c0b0a3c337a521d083374c918dc52c666f +staging.current 69e273c0b0a3c337a521d083374c918dc52c666f +char-misc.current 69e273c0b0a3c337a521d083374c918dc52c666f +input-current a2418fc4a13b5da8d007a038c0a6a50a54edfabd +md-current d47648fcf0611812286f68131b40251c6fa54f5e +crypto-current ce5481d01f67ad304908ec2113515440c0fa86eb +ide a53dae49b2fea43d8f4ec5aeca0e288bbc8d6895 +dwmw2 5950f0803ca9d396ab79b7fe6789351f96e1d8d5 +devicetree-current 5a12a597a8627b91fd9d94365853f9f69a4f399c +rr-fixes ff7e0055bb5ddbbb320cdd8dfd3e18672bddd2ad +mfd-fixes +vfio-fixes 239a87020b263fe7e70adc5803cb157955023d3c +drm-intel-fixes be71eabebaf9f142612d34d42292b454e984dcb5 +asm-generic fb9de7ebc3a2eb7ddb83c92e288447a0c313bced +arc 2a5e95d4181c3f177a41b7c141a816859478c4d7 +arm 6f3df165025314cbfc5d1d3f6b44dd356f97475b +arm-perf 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +arm-soc e91fce2ca8f739b99d77898fd52b849dacbaa74a +bcm2835 fa389e220254c69ffae0d403eac4146171062d08 +cortex-m f0d7515372ff0ea53fd66099533d3c8e0464cbbf +ep93xx bfb0709fd17b13498d99592bbe12c91130e35a55 +imx-mxs fd1a89ba8d8ab269c77d9b191f701299d42aebc8 +ixp4xx 19f949f52599ba7c3f67a5897ac6be14bfcb1200 +keystone c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 +msm 81cf1e061d001fab44dbaa85fc4fbfb6da6713a1 +mvebu 74328d67b0018aa6293d57bc9f4798312105a888 +renesas ac0066eb568c6e6d82703e5f2b972d5b8fbadadd +samsung 213e1f6f5f0bdd314222c4cf49f94045d74c40ec +tegra ef70728c7a6571a1a7115031e932b811f1740b2e +ed2451e40bd170669cb2e7409e66b9a6a3f7b766 +arm64 ea1719672f59eeb85829073b567495c4f472ac9f +blackfin 275f5a8573e7832d0cf344a1b29da357c7038870 +c6x ae72758f1dd93bd367dc7719702f24a9bfb3bad9 +cris cd065a010a97e3c330d1ded9af551664c9689b19 +hexagon a9a44fdf329668125042055c569656aa83d8cccb +ia64 6b15075c2c3662dbe1ac41404c6a2013b24efa1d +m68k 9117710a5997eb078035052800a31b77d47e0e5a +m68knommu 740c615d71f4afc78de9f9c450adb6a3a838cd9f +metag f93125ae17d1d259b5aba84016db260903822194 +microblaze e8bbef945111dddf556e79dc4e6eec089d5cf724 +mips 739c25724af0db4d28e6e3a25ad5e78e20cf7a40 +openrisc 548dafe880ad84d0accc0a5596c26e3348b103e1 +parisc 6c700d71f7faecb540b3fa4303edb5323a2768c1 +parisc-hd c90f06943e05519a87140dc407cf589c220aeedf +powerpc 9e813308a5c18c58f9ccae1ec72ed4e14eaf9025 +mpc5xxx bc75059422338197ce487d338ac9c898761e1e61 +galak +s390 f8a31c125632788f0a1960246e79ee66845de486 +sparc-next 451fd72219dd6f3355e2d036c598544c760ee532 +tile 9c29b2aea7fae92b44819eab55c87066c1e8a527 +uml 989e59fa41c5464ab77bf0bf82f32f721430544e +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa e792290be763932d1b8cdf8a36d7015482a49d07 +btrfs 8d875f95da43c6a8f18f77869f2ef26e9594fecc +ceph 5f740d7e1531099b888410e6bab13f68da9b1a4d +cifs ca5d13fc33cc56f7405004574d18172ddbdea2ef +configfs b930c26416c4ea6855726fd977145ccea9afbdda +ecryptfs 04ec5f5c0022ee941615e304bc75853fe1bc94ba +ext3 e6d8fb340f20bc5275ceed86133d1823dec9478d +ext4 6bf70f3599f90a321fd8bc7ce4d1ae4fbc3d99fe +f2fs b73e52824c8920a5ff754e3c8ff68466a7dd61f9 +fscache fe02fb3ec10932ce07406b1581e28326181fc9d8 +fuse d7afaec0b564f0609e116f562983b8e72fc3e9c9 +gfs2 2ddfbdd6848d496d8088b28992d257fd02e58c9d +jfs bb5e50aaa80564268f950d1b2f764455afbfea82 +logfs 339466142b3f58fe0ee4dea7e8c5f3d33099e89c +nfs 7505ceaf863590b24a4c0c83b64817d26e0d51e3 +nfsd b06556167d91ecb5cf2d882fff8e2afac6baea0f +omfs 976d167615b64e14bc1491ca51d424e2ba9a5e84 +squashfs 6d565409503f4e1f74ac30de14e8c91a2b826cd8 +v9fs f15844e0777fec936f87a87f97394f83911dacd3 +ubifs 25601a3c9737fed554169759582c690b98ead5d4 +xfs 41b9d7263ea1e270019c5d04fa0ab15db50b9725 +file-private-locks +vfs 7b0527f875b1799a3f8de9ce1c792eb882cee559 +pci 52addcf9d6669fa439387610bc65c92fa0980cef +hid d419a1c245dd749a2638a7b881524f1948515efd +i2c 75b81f339c6af43f6f4a1b3eabe0603321dade65 +jdelvare-hwmon c7208164e66f63e3ec1759b98087849286410741 +hwmon-staging ce95e1886a5f2c70e129da041f128fa2756d992e +v4l-dvb d1352f268415182f9bfc06b142fb50083e5f6479 +kbuild c7377ed8b9ebc59eabd35f398e9d65c7467cbdd4 +kconfig 95edca5c523c4b404dd60baa0a1bea0e4c38fd72 +libata ec0322e4423aeff02550be1b4df3edc4ca419e6c +pm a251c37e85be81bea922feda900df5fbe7e09b56 +idle e7c95ff32d0075736cbdd8d38d954fb4ed6ced9b +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +cpupowerutils f16603386b38c28979f4df1cafdc2fe73fa87d37 +thermal 47d104ba5879790c7c91c3390b0b08399e168efe +ieee1394 d584a66279949561418c82b12bb4c055e6c25836 +dlm 883854c5457a97190f7b0ee20f03bcd9664fc0c2 +swiotlb 8e0629c1d4ce86ce7d98ca8756f42769bb17a3c8 +slave-dma bebbbb764e5baea061ee05f6f00114f3d840d5fc +dmaengine fbeec99ad5c03060ba71c470ac373e24e23a80e0 +net-next 10770bc2d1702e05575db0072e1ebbc06d0b270e +ipsec-next 0244790c8ad2408dfb313e5c886e6e5a808ea946 +wireless-next 6a5d088a923854569e20eac4f3f569926d5911ec +bluetooth b804f096de0ff8b961ae7809e4b50ec9cb492903 +infiniband d087f6ad724dfbcdc3df8e0191b80d9d8d839e71 +mtd b25046b1e5e3f1423434da77ccc859f2f779d1ce +l2-mtd 5b49ab3e03f68eb49db4bce6290e5707b7f6c6f3 +crypto ab81873974afa3ce7bd8669580b06d33353f1e7c +drm 47c1296829505d119d7d58dd23d39cc5db344f12 +drm-intel d5f0b5cb412003274cde50b0583727d0c33bf6e4 +drm-tegra +sound 0279661b640317c31f288d66537d5805d4f18d05 +sound-asoc 1b8e4f11c2d42707a8c9591f00a6cfeb7b33c682 +modules 480cadc2b7e0fa2bbab20141efb547dfe0c3707c +virtio 480cadc2b7e0fa2bbab20141efb547dfe0c3707c +input 6ba694560caeb3531dbedd5b3a37af037ef2a833 +input-mt 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 +block f37513ea97f9f6b9780f7fe068ab0b21e93aabe7 +device-mapper e8531a5cbbd9f7aec0bed35d1360e15f4c867006 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 80af9e6d7ae633309cc5bca96aee6a45117e7c98 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +kgdb 662bfa325be19ac98af0bc6b31fe142f09033301 +slab +uclinux 6dbe51c251a327e012439c4772097a13df43c5b8 +md 90c25a429b6202262135499a03c6d0ae4c28733d +mfd +mfd-lj +battery 5e37195f30cc31e6a1052cbc282254e127c1b8c7 +fbdev 718b90ac4c21c81f42b6db062ca0867f3cac7648 +viafb 838ac785d521e091bd8b5f6a2b545166f5f32b77 +omap_dss2 58678a77029bc1f78f80f6f93da3d302d587f951 +regulator 8d0ebe500af231316f15bba70f9246db18c46b6a +security c3ce6dfa48e3879206382cdfdc015bffc50dce30 +selinux 7b0d0b40cd78cadb525df760ee4cac151533c2b5 +lblnet d8ec26d7f8287f5788a494f56e8814210f0e64be +watchdog 8083baba5e9ca5c3a06dace475307f14498604e3 +dwmw2-iommu 1860e379875dfe7271c649058aeddffe5afd9d0d +iommu 0fdb6739098d049397b6bacadd6b8d28063308a1 +vfio 9b936c960f22954bfb89f2fefd8f96916bb42908 +osd ce5d36aac26cc395fe3bc45525cdbad3644f01e5 +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +trivial f9134be491dec9e6cada46abbfb01982a7afffa8 +audit 451fd72219dd6f3355e2d036c598544c760ee532 +fsnotify 1ca39ab9d21ac93f94b9e3eb364ea9a5cf2aba06 +devicetree a9ecdc0fdc54aa499604dbd43132988effcac9b4 +dt-rh 99de64984c3a7c9bf56a50e6dcc51006c9485620 +spi 597fc0964922a9517b107051cadcc6e2a00c4878 +tip 8a6d068d3addf2236276f035ee4f6f6442799f31 +clockevents 3252a646aa2cf706b2a26433a8bd9cb2e5dce410 +edac 50d1bb93672fa2f42cec6e06ce799fbe864f57e9 +edac-amd f4ce6eca71d15b8e12a33ac8e1ef733a83944d2e +ftrace 4ce97dbf50245227add17c83d87dc838e7ca79d0 +rcu 11ed7f934cb807f26da09547b5946c2e534d1dac +uprobes 0326f5a94ddea33fa331b2519f4172f4fb387baa +kvm fd2752352bbc98850d83b5448a288d8991590317 +kvm-arm +kvm-ppc c77dcacb397519b6ade8f08201a4a90a7f4f751e +oprofile 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae +fw-nohz 74876a98a87a115254b3a66a14b27320b7f0acaa +xen-tip db77bfe346ab7202c2878d9cb48b4eeaac969bf4 +percpu a8a26555d779b823b5b5953008235f13a8d5f882 +workqueues ebb48ccd98d184cc7cd04aace4a64ed46da44ea9 +drivers-x86 770235f68ab61c2106f21a673d869aa35126a2bd +chrome-platform 5502486a2077e4280c618b82e8a77ed35932956f +sysctl 4e474a00d7ff746ed177ddae14fa8b2d4bad7a00 +regmap 0a03509d8bcd93a09c6a7133981a0ef982c8f072 +hsi 3fd276e9c0d75538c3b5ed96d0ce36d227fdca95 +leds 3f6815f711efffb357fc97fa2a7c96489b38e641 +driver-core 69e273c0b0a3c337a521d083374c918dc52c666f +tty 69e273c0b0a3c337a521d083374c918dc52c666f +usb 69e273c0b0a3c337a521d083374c918dc52c666f +usb-gadget 8913dc0bb913ac3dc83ed5c10bac2f4e55431981 +staging 220f115e5edd2163cac6ba808588051d1dbbd62c +char-misc 69e273c0b0a3c337a521d083374c918dc52c666f +cgroup 549cb2747e0fdb95fa0ce27d4819796812d5f178 +scsi 659c26fd547a48d00caaa160f99822024abdc8fe +target-updates df7c3d7ba056cff1af46b0c7c43ede803e5e927d +target-merge b28a960c42fcd9cfc987441fa6d1c1a471f0f9ed +writeback f9b0e058cbd04ada76b13afffa7e1df830543c24 +hwspinlock 8b37fcfc9b3400b647748783a2cafff67793e0ad +pinctrl aa2293d82c29309d8399d41941add7af606a4fea +vhost 970379f59d81edf78a319f9cdc1234730bcbe6b2 +remoteproc 9a3c4145af32125c5ee39c0272662b47307a8323 +rpmsg 397944df3290ddc46dcc6a08cd71fb560700431b +gpio 42c526f8bc260fc8e961bbbfd2518d4d96e371a2 +dma-mapping b4bbb107d73bbc0d92c9ae7fd8e69580aa9381e7 +pwm 70145f87139fbc43b726f873813cd91dce371899 +dma-buf 101e31050bf174e5bcca72bdb9d0bd392aa4f966 +userns a1998908ba46526ac5cbbb9aae610cb234bd9f33 +ktest 4c16b1d6d5e0ca0612de65596a3d1ead8a3372fb +signal 20b4fb485227404329e41ad15588afad3df23050 +clk 16eeaec77922c1349e130a9541e83a023deaf11f +random 13aa93c70e716b597d2451abee5e9f0b140b831c +lzo-update 42b775abafafdf811ef300e869a4e1480ef1cf95 +arm64-hugepages +aio 7be141d0554921751db103b54e9f794956aa4f65 +llvmlinux fae6d26ae729accf78c5415ea499736b3def01f7 +rd-docs 3302616426067c8c9d2f8086243a699afcdf868e +akpm-current 14e81f95f9a0d0f439067828de9ae8beaeeded62 +akpm 56dac764e0386f59ffa78865ff1268ed9a1c917a diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..f4832a675fc7 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,215 @@ +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 +powerpc-merge 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 git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.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 +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 +md-current git git://neil.brown.name/md#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 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +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 +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git#for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +ep93xx git git://github.com/RyanMallon/linux-ep93xx.git#ep93xx-for-next +imx-mxs git git://git.linaro.org/people/shawnguo/linux-2.6.git#for-next +ixp4xx git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux.git#next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +msm git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.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 +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.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://www.jni.nu/cris.git#for-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 +openrisc git git://openrisc.net/jonas/linux#for-upstream +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +mpc5xxx git git://git.denx.de/linux-2.6-agust.git#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.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#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 +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-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/steve/gfs2-3.0-nmw.git#master +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +logfs git git://github.com/prasad-joshi/logfs_upstream.git#master +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 +omfs git git://github.com/bcopeland/omfs.git#for-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://oss.sgi.com/xfs/xfs.git#for-next +file-private-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-3/jdelvare-hwmon/ +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 +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.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 +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.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-next git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/users/dedekind/l2-mtd-2.6.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-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +virtio git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#virtio-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://github.com/rydberg/linux.git#for-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 +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +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 +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +slab git git://github.com/penberg/linux.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git#master +mfd-lj git git://git.linaro.org/people/ljones/mfd.git#for-mfd-next +battery git git://git.infradead.org/battery-2.6.git#master +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git#for-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +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 +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 +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +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/eparis/audit.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#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 +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 +uprobes git git://github.com/srikard/linux.git#for-next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://github.com/columbia/linux-kvm-arm.git#kvm-arm-next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +fw-nohz git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#nohz/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://cavan.codon.org.uk/platform-drivers-x86.git#linux-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl.git#master +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://gitorious.org/kernel-hsi/kernel-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git#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 +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 +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 +writeback git git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux.git#writeback-for-next +hwspinlock git git://github.com/ohadbc/hwspinlock-next.git#linux-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://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 +signal git git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git#for-next +clk git git://git.linaro.org/people/mturquette/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +lzo-update git git://github.com/markus-oberhumer/linux.git#lzo-update +arm64-hugepages git git://git.linaro.org/people/stevecapper/linux.git#for-next/hugepages +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +rd-docs quilt http://www.infradead.org/~rdunlap/Doc/patches/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0716536fa833 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4590 @@ +$ date +Wed 3 Sep 10:52:26 BST 2014 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 7505ceaf8635 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (7505ceaf8635 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Already up-to-date. +Merging fixes/master (23cf8d3ca0fd powerpc: Fix "attempt to move .org backwards" error) +$ git merge fixes/master +Merge made by the 'recursive' strategy. +Merging kbuild-current/rc-fixes (7d1311b93e58 Linux 3.17-rc1) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (89ca3b881987 Linux 3.15-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (eba1c71819d2 ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (4ed7800987b1 m68k: Wire up memfd_create) +$ git merge m68k-current/for-linus +Merge made by the 'recursive' strategy. + arch/m68k/include/asm/unistd.h | 2 +- + arch/m68k/include/uapi/asm/unistd.h | 2 ++ + arch/m68k/kernel/syscalltable.S | 2 ++ + 3 files changed, 5 insertions(+), 1 deletion(-) +Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-merge/merge (396a34340cdf powerpc: Fix endianness of flash_block_list in rtas_flash) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge sparc/master +Already up-to-date. +Merging net/master (bec6bfb2437f amd-xgbe: Fix initialization of the wrong spin lock) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/net/stmmac.txt | 4 + + drivers/bcma/host_pci.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 30 +++++ + drivers/infiniband/hw/mlx4/qp.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 15 ++- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 + + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 7 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 4 + + drivers/net/ethernet/apm/xgene/Kconfig | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 57 ++++++--- + drivers/net/ethernet/broadcom/tg3.c | 16 +++ + drivers/net/ethernet/broadcom/tg3.h | 1 + + drivers/net/ethernet/brocade/bna/bnad.c | 7 +- + drivers/net/ethernet/calxeda/Kconfig | 1 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 16 ++- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 79 ++++++++++-- + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 4 + + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 19 +-- + drivers/net/ethernet/intel/e1000e/netdev.c | 21 ++- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 8 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 31 +---- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 38 ++++++ + drivers/net/ethernet/moxa/moxart_ether.c | 34 ++--- + drivers/net/ethernet/nxp/lpc_eth.c | 3 + + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 5 +- + drivers/net/ethernet/renesas/Kconfig | 1 + + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 13 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/mmc.h | 2 +- + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 15 ++- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 9 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 142 +++++++++++++++------ + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 1 + + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h | 2 - + drivers/net/phy/phy.c | 18 +-- + drivers/net/vxlan.c | 8 +- + drivers/net/wireless/at76c50x-usb.c | 3 +- + drivers/net/wireless/ath/ath9k/spectral.c | 2 +- + .../net/wireless/rtlwifi/btcoexist/halbtcoutsrc.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 1 + + drivers/net/xen-netback/interface.c | 6 +- + drivers/s390/net/qeth_core.h | 1 + + drivers/s390/net/qeth_core_main.c | 16 ++- + drivers/s390/net/qeth_l2_sys.c | 7 +- + drivers/ssb/b43_pci_bridge.c | 1 + + include/linux/mlx4/device.h | 3 + + include/linux/netfilter.h | 5 +- + include/net/bluetooth/hci_core.h | 2 + + include/net/netns/ieee802154_6lowpan.h | 1 - + include/net/sctp/sctp.h | 13 ++ + net/bluetooth/hci_conn.c | 8 ++ + net/bluetooth/hci_core.c | 14 +- + net/bluetooth/hci_event.c | 17 ++- + net/core/dev.c | 77 ++++++++++- + net/core/sock.c | 30 +++-- + net/ieee802154/6lowpan_rtnl.c | 4 +- + net/ieee802154/reassembly.c | 15 +-- + net/ipv4/netfilter/Kconfig | 102 ++++++++------- + net/ipv4/netfilter/Makefile | 2 +- + net/ipv6/netfilter/Kconfig | 28 ++-- + net/ipv6/netfilter/Makefile | 2 +- + net/mac802154/wpan.c | 6 +- + net/netfilter/Kconfig | 6 +- + net/netfilter/Makefile | 2 +- + net/netfilter/core.c | 6 +- + net/netfilter/ipvs/ip_vs_core.c | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 20 ++- + net/netfilter/xt_cgroup.c | 2 +- + net/openvswitch/datapath.c | 4 +- + net/rfkill/rfkill-gpio.c | 1 + + net/sctp/socket.c | 2 +- + 81 files changed, 759 insertions(+), 321 deletions(-) +Merging ipsec/master (2d39d120781a mvneta: Add missing if_vlan.h include.) +$ git merge ipsec/master +Already up-to-date. +Merging sound-current/for-linus (acf08081adb5 ALSA: hda - Fix COEF setups for ALC1150 codec) +$ git merge sound-current/for-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1088 and retry the command. +Merge made by the 'recursive' strategy. + sound/firewire/amdtp.c | 11 ++++++++++- + sound/firewire/amdtp.h | 1 + + sound/firewire/dice.c | 29 ++++++++++++++++++++--------- + sound/pci/hda/patch_conexant.c | 9 ++++++++- + sound/pci/hda/patch_realtek.c | 2 ++ + 5 files changed, 41 insertions(+), 11 deletions(-) +Merging pci-current/for-linus (8d7004a6904c PCI: spear: Remove module option) +$ git merge pci-current/for-linus +Auto-merging drivers/pci/host/Kconfig +Merge made by the 'recursive' strategy. + drivers/pci/host/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless/master (c66517165610 rtlwifi: rtl8192cu: Add new ID) +$ git merge wireless/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (69e273c0b0a3 Linux 3.17-rc3) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (69e273c0b0a3 Linux 3.17-rc3) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (69e273c0b0a3 Linux 3.17-rc3) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (69e273c0b0a3 Linux 3.17-rc3) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (69e273c0b0a3 Linux 3.17-rc3) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (a2418fc4a13b Input: elantech - add support for trackpoint found on some v3 models) +$ git merge input-current/for-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1086 and retry the command. +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,maxtouch.txt | 11 ++ + drivers/input/input-mt.c | 30 +++-- + drivers/input/mouse/alps.c | 4 +- + drivers/input/mouse/elantech.c | 137 +++++++++++++++++++-- + drivers/input/mouse/elantech.h | 3 + + drivers/input/serio/i8042-sparcio.h | 3 +- + 6 files changed, 164 insertions(+), 24 deletions(-) +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (ce5481d01f67 crypto: drbg - fix failure of generating multiple of 2**16 bytes) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (a53dae49b2fe ide: use module_platform_driver()) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (5a12a597a862 arm: Add devicetree fixup machine function) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (ff7e0055bb5d module: Clean up ro/nx after early module load failures) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging mfd-fixes/master () +$ git merge mfd-fixes/master +merge: mfd-fixes/master - not something we can merge +$ git commit -v -a +On branch master +Untracked files: + drivers/base/dma-mapping.c.rej + +nothing added to commit but untracked files present +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/atmel,maxtouch.txt | 11 ++ + drivers/input/input-mt.c | 30 +++-- + drivers/input/mouse/alps.c | 4 +- + drivers/input/mouse/elantech.c | 137 +++++++++++++++++++-- + drivers/input/mouse/elantech.h | 3 + + drivers/input/serio/i8042-sparcio.h | 3 +- + 6 files changed, 164 insertions(+), 24 deletions(-) +Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (be71eabebaf9 Revert "drm/i915: Enable semaphores on BDW") +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (2a5e95d4181c mm, arc: remove obsolete pagefault oom killer comment) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (6f3df1650253 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + arch/arm/crypto/sha1-armv7-neon.S | 39 ++++++++++++++++++++++----------------- + arch/arm/include/asm/smp.h | 6 ------ + arch/arm/kernel/smp.c | 12 ++++-------- + crypto/Kconfig | 4 ++-- + 4 files changed, 28 insertions(+), 33 deletions(-) +Merging arm-perf/for-next/perf (7d1311b93e58 Linux 3.17-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (e91fce2ca8f7 Merge branch 'fixes' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 25 +++++++++++++++++++++++++ + arch/arm/boot/dts/ste-snowball.dts | 1 - + arch/arm/configs/multi_v7_defconfig | 11 +++++++++++ + 3 files changed, 36 insertions(+), 1 deletion(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6) +$ git merge bcm2835/for-next +Already up-to-date. +Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support) +$ git merge cortex-m/for-next +Already up-to-date. +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 6086 and retry the command. +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (fd1a89ba8d8a Merge branch 'imx/dt' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/mach-imx/pcm970-baseboard.c +Removing arch/arm/mach-imx/mach-pcm038.c +Removing arch/arm/mach-imx/mach-mx1ads.c +Removing arch/arm/mach-imx/mach-cpuimx27.c +Removing arch/arm/mach-imx/eukrea_mbimx27-baseboard.c +Removing arch/arm/mach-imx/board-pcm038.h +Auto-merging arch/arm/boot/dts/vf610-colibri.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/trivial-devices.txt | 2 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +- + .../devicetree/bindings/regulator/da9210.txt | 4 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 7 +- + arch/arm/boot/dts/imx1-ads.dts | 152 +++++++++ + arch/arm/boot/dts/imx1-apf9328.dts | 129 ++++++++ + arch/arm/boot/dts/imx1-pinfunc.h | 302 +++++++++++++++++ + arch/arm/boot/dts/imx1.dtsi | 266 +++++++++++++++ + arch/arm/boot/dts/imx25-pinfunc.h | 33 +- + arch/arm/boot/dts/imx25.dtsi | 4 +- + arch/arm/boot/dts/imx28.dtsi | 43 +++ + arch/arm/boot/dts/imx35.dtsi | 1 + + arch/arm/boot/dts/imx50.dtsi | 2 + + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53-smd.dts | 2 +- + arch/arm/boot/dts/imx53.dtsi | 8 + + arch/arm/boot/dts/imx6dl-gw552x.dts | 20 ++ + arch/arm/boot/dts/imx6dl-hummingboard.dts | 203 +----------- + arch/arm/boot/dts/imx6q-gw552x.dts | 24 ++ + arch/arm/boot/dts/imx6q-hummingboard.dts | 21 ++ + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 267 +++++++++++++++ + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 200 ++++++++++++ + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 38 +++ + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 19 ++ + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6sl-evk.dts | 104 +++++- + arch/arm/boot/dts/imx6sl.dtsi | 19 +- + arch/arm/boot/dts/imx6sx.dtsi | 3 + + arch/arm/boot/dts/r8a7790-lager.dts | 2 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +- + arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 46 +++ + .../dts/{vf610-colibri.dts => vf610-colibri.dtsi} | 22 +- + arch/arm/boot/dts/vf610-twr.dts | 26 +- + arch/arm/boot/dts/vf610.dtsi | 60 +++- + arch/arm/configs/imx_v4_v5_defconfig | 5 - + arch/arm/mach-imx/Kconfig | 99 +----- + arch/arm/mach-imx/Makefile | 6 +- + arch/arm/mach-imx/anatop.c | 13 + + arch/arm/mach-imx/board-pcm038.h | 36 --- + arch/arm/mach-imx/clk-imx6q.c | 7 +- + arch/arm/mach-imx/clk-imx6sl.c | 14 +- + arch/arm/mach-imx/clk-vf610.c | 21 +- + arch/arm/mach-imx/common.h | 2 - + arch/arm/mach-imx/cpuidle-imx6q.c | 4 - + arch/arm/mach-imx/eukrea-baseboards.h | 10 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 351 -------------------- + arch/arm/mach-imx/imx1-dt.c | 26 ++ + arch/arm/mach-imx/iomux-imx31.c | 7 - + arch/arm/mach-imx/iomux-v1.c | 2 - + arch/arm/mach-imx/iomux-v3.c | 2 - + arch/arm/mach-imx/mach-cpuimx27.c | 321 ------------------ + arch/arm/mach-imx/mach-imx6sx.c | 3 + + arch/arm/mach-imx/mach-mx1ads.c | 154 --------- + arch/arm/mach-imx/mach-pcm038.c | 358 --------------------- + arch/arm/mach-imx/mxc.h | 2 + + arch/arm/mach-imx/pcm970-baseboard.c | 231 ------------- + arch/arm/mach-imx/platsmp.c | 10 - + drivers/mfd/da9055-core.c | 26 +- + include/dt-bindings/clock/imx6qdl-clock.h | 7 +- + include/dt-bindings/clock/vf610-clock.h | 5 +- + 62 files changed, 1922 insertions(+), 1848 deletions(-) + create mode 100644 arch/arm/boot/dts/imx1-ads.dts + create mode 100644 arch/arm/boot/dts/imx1-apf9328.dts + create mode 100644 arch/arm/boot/dts/imx1-pinfunc.h + create mode 100644 arch/arm/boot/dts/imx1.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-gw552x.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw552x.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw552x.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi + create mode 100644 arch/arm/boot/dts/vf610-colibri-eval-v3.dts + rename arch/arm/boot/dts/{vf610-colibri.dts => vf610-colibri.dtsi} (92%) + delete mode 100644 arch/arm/mach-imx/board-pcm038.h + delete mode 100644 arch/arm/mach-imx/eukrea_mbimx27-baseboard.c + create mode 100644 arch/arm/mach-imx/imx1-dt.c + delete mode 100644 arch/arm/mach-imx/mach-cpuimx27.c + delete mode 100644 arch/arm/mach-imx/mach-mx1ads.c + delete mode 100644 arch/arm/mach-imx/mach-pcm038.c + delete mode 100644 arch/arm/mach-imx/pcm970-baseboard.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (c9eaa447e77e Linux 3.15-rc1) +$ git merge keystone/next +Already up-to-date. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (74328d67b001 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-370-db.dts | 6 +++ + arch/arm/boot/dts/armada-370-mirabox.dts | 6 +++ + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 4 ++ + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 6 +++ + arch/arm/boot/dts/armada-370-rd.dts | 4 ++ + arch/arm/boot/dts/armada-370.dtsi | 19 ++++++++ + arch/arm/boot/dts/armada-375.dtsi | 6 +++ + arch/arm/configs/mvebu_v7_defconfig | 67 ++++++++++++-------------- + 8 files changed, 82 insertions(+), 36 deletions(-) +Merging renesas/next (ac0066eb568c Merge branches 'heads/dt-for-v3.18', 'heads/kconfig-cleanups-for-v3.18', 'heads/defconfig-for-v3.18', 'heads/r8a7740-multiplatform-for-v3.18' and 'heads/clk-for-v3.18' into next) +$ git merge renesas/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1042 and retry the command. +Removing arch/arm/mach-shmobile/r7s72100.h +Removing arch/arm/mach-shmobile/clock-r7s72100.c +Removing arch/arm/mach-shmobile/board-genmai.c +Removing arch/arm/mach-shmobile/board-genmai-reference.c +Removing arch/arm/mach-shmobile/board-armadillo800eva-reference.c +Auto-merging arch/arm/boot/dts/r8a7791-koelsch.dts +Auto-merging arch/arm/boot/dts/r8a7790-lager.dts +Removing arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 71 ++++++ + MAINTAINERS | 1 - + arch/arm/Kconfig | 2 + + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 4 + + arch/arm/boot/dts/r7s72100.dtsi | 10 + + arch/arm/boot/dts/r8a73a4.dtsi | 2 +- + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 283 --------------------- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 276 +++++++++++++++++++- + arch/arm/boot/dts/r8a7740.dtsi | 220 +++++++++++++++- + arch/arm/boot/dts/r8a7778.dtsi | 6 + + arch/arm/boot/dts/r8a7779-marzen.dts | 4 + + arch/arm/boot/dts/r8a7779.dtsi | 58 ++++- + arch/arm/boot/dts/r8a7790-lager.dts | 40 +++ + arch/arm/boot/dts/r8a7790.dtsi | 159 +++++++++++- + arch/arm/boot/dts/r8a7791-henninger.dts | 35 +++ + arch/arm/boot/dts/r8a7791-koelsch.dts | 39 +++ + arch/arm/boot/dts/r8a7791.dtsi | 140 +++++++++- + arch/arm/boot/dts/sh7372.dtsi | 1 + + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 4 +- + arch/arm/boot/dts/sh73a0.dtsi | 26 +- + arch/arm/configs/ape6evm_defconfig | 9 +- + arch/arm/configs/bockw_defconfig | 3 +- + arch/arm/configs/koelsch_defconfig | 17 ++ + arch/arm/configs/kzm9g_defconfig | 1 + + arch/arm/configs/lager_defconfig | 8 +- + arch/arm/configs/marzen_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 15 ++ + arch/arm/mach-shmobile/Kconfig | 99 +++---- + arch/arm/mach-shmobile/Makefile | 35 +-- + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +- + arch/arm/mach-shmobile/board-ape6evm.c | 3 +- + .../board-armadillo800eva-reference.c | 198 -------------- + arch/arm/mach-shmobile/board-bockw-reference.c | 3 +- + arch/arm/mach-shmobile/board-bockw.c | 2 +- + arch/arm/mach-shmobile/board-genmai-reference.c | 55 ---- + arch/arm/mach-shmobile/board-genmai.c | 161 ------------ + arch/arm/mach-shmobile/board-koelsch-reference.c | 2 - + arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +- + arch/arm/mach-shmobile/board-kzm9g.c | 2 +- + arch/arm/mach-shmobile/board-lager-reference.c | 2 - + arch/arm/mach-shmobile/board-mackerel.c | 1 + + arch/arm/mach-shmobile/board-marzen-reference.c | 12 +- + arch/arm/mach-shmobile/clock-r7s72100.c | 231 ----------------- + arch/arm/mach-shmobile/common.h | 2 - + arch/arm/mach-shmobile/dma-register.h | 4 +- + arch/arm/mach-shmobile/intc.h | 5 + + arch/arm/mach-shmobile/irqs.h | 8 +- + arch/arm/mach-shmobile/pm-r8a7740.c | 5 +- + arch/arm/mach-shmobile/pm-rcar.c | 4 - + arch/arm/mach-shmobile/pm-rmobile.c | 2 - + arch/arm/mach-shmobile/pm-rmobile.h | 4 +- + arch/arm/mach-shmobile/r7s72100.h | 7 - + arch/arm/mach-shmobile/r8a73a4.h | 1 - + arch/arm/mach-shmobile/r8a7740.h | 5 +- + arch/arm/mach-shmobile/r8a7779.h | 1 - + arch/arm/mach-shmobile/r8a7790.h | 1 - + arch/arm/mach-shmobile/r8a7791.h | 1 - + arch/arm/mach-shmobile/setup-r7s72100.c | 24 +- + arch/arm/mach-shmobile/setup-r8a73a4.c | 10 +- + arch/arm/mach-shmobile/setup-r8a7740.c | 34 +-- + arch/arm/mach-shmobile/setup-r8a7778.c | 5 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 20 +- + arch/arm/mach-shmobile/setup-r8a7790.c | 7 +- + arch/arm/mach-shmobile/setup-r8a7791.c | 7 +- + arch/arm/mach-shmobile/setup-sh7372.c | 4 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 10 +- + arch/arm/mach-shmobile/timer.c | 21 +- + drivers/clk/shmobile/Makefile | 1 + + include/dt-bindings/clock/r8a7740-clock.h | 77 ++++++ + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 1 + + 73 files changed, 1292 insertions(+), 1232 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt + delete mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts + delete mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-genmai-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-genmai.c + delete mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c + delete mode 100644 arch/arm/mach-shmobile/r7s72100.h + create mode 100644 include/dt-bindings/clock/r8a7740-clock.h +Merging samsung/for-next (213e1f6f5f0b Merge branch 'v3.18-next/dt-samsung' into for-next) +$ git merge samsung/for-next +Auto-merging arch/arm/mach-s5pv210/regs-clock.h +Removing arch/arm/mach-exynos/include/mach/memory.h +Removing arch/arm/boot/dts/exynos5250-cros-common.dtsi +Auto-merging arch/arm/boot/dts/exynos4412-odroid-common.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +- + arch/arm/boot/dts/exynos4412-origen.dts | 8 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 8 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 18 +-- + arch/arm/boot/dts/exynos5250-cros-common.dtsi | 164 --------------------- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +-- + arch/arm/boot/dts/exynos5250-snow.dts | 154 ++++++++++++++++--- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 18 +-- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 18 +-- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 16 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 28 ++-- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 16 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 28 ++-- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/mach-exynos/include/mach/memory.h | 26 ---- + arch/arm/mach-s5pv210/pm.c | 3 +- + .../mach-s5pv210/{include/mach => }/regs-clock.h | 3 +- + arch/arm/mach-s5pv210/s5pv210.c | 2 +- + 18 files changed, 191 insertions(+), 346 deletions(-) + delete mode 100644 arch/arm/boot/dts/exynos5250-cros-common.dtsi + delete mode 100644 arch/arm/mach-exynos/include/mach/memory.h + rename arch/arm/mach-s5pv210/{include/mach => }/regs-clock.h (99%) +Merging tegra/for-next (ed2451e40bd1 Merge branch for-3.18/defconfig into for-next) +$ git merge tegra/for-next +Removing include/linux/platform_data/tegra_emc.h +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra20-flowctrl.txt | 12 ++++ + arch/arm/boot/dts/tegra114.dtsi | 5 ++ + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 70 ++++++++++++++++++++++ + arch/arm/boot/dts/tegra124.dtsi | 30 ++++++++++ + arch/arm/boot/dts/tegra20.dtsi | 5 ++ + arch/arm/boot/dts/tegra30.dtsi | 5 ++ + arch/arm/configs/tegra_defconfig | 3 + + arch/arm/mach-tegra/flowctrl.c | 44 +++++++++++--- + arch/arm/mach-tegra/flowctrl.h | 2 + + arch/arm/mach-tegra/tegra.c | 2 + + include/linux/platform_data/tegra_emc.h | 34 ----------- + 11 files changed, 171 insertions(+), 41 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-flowctrl.txt + delete mode 100644 include/linux/platform_data/tegra_emc.h +Merging arm64/for-next/core (ea1719672f59 arm64: add newline to I-cache policy string) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1107 and retry the command. +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (cd065a010a97 CRISv10: Readd missing header) +$ git merge cris/for-next +Already up-to-date. +Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (6b15075c2c36 [IA64] sn: Do not needlessly convert between pointers and integers) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (9117710a5997 m68k/sun3: Remove define statement no longer needed) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (740c615d71f4 m68knommu: fix size of address field for 5272 interrupt controller) +$ git merge m68knommu/for-next +Removing arch/m68k/platform/Makefile +Auto-merging arch/m68k/coldfire/vectors.c +Auto-merging arch/m68k/coldfire/m54xx.c +Auto-merging arch/m68k/coldfire/m5407.c +Auto-merging arch/m68k/coldfire/m5307.c +Auto-merging arch/m68k/coldfire/m528x.c +Auto-merging arch/m68k/coldfire/m527x.c +Auto-merging arch/m68k/coldfire/m5272.c +Auto-merging arch/m68k/coldfire/m525x.c +Auto-merging arch/m68k/coldfire/m5249.c +Auto-merging arch/m68k/coldfire/m523x.c +Auto-merging arch/m68k/coldfire/m520x.c +Auto-merging arch/m68k/coldfire/m5206.c +Auto-merging arch/m68k/coldfire/intc-5272.c +Auto-merging arch/m68k/coldfire/entry.S +Auto-merging arch/m68k/68360/ints.c +Auto-merging arch/m68k/68360/head-rom.S +Auto-merging arch/m68k/68360/head-ram.S +Auto-merging arch/m68k/68360/entry.S +Auto-merging arch/m68k/68360/config.c +Auto-merging arch/m68k/68360/Makefile +Auto-merging arch/m68k/68000/entry.S +Merge made by the 'recursive' strategy. + arch/m68k/{platform => }/68000/Makefile | 0 + arch/m68k/{platform => }/68000/bootlogo-vz.h | 0 + arch/m68k/{platform => }/68000/bootlogo.h | 0 + arch/m68k/{platform => }/68000/entry.S | 2 +- + arch/m68k/{platform => }/68000/head.S | 0 + arch/m68k/{platform => }/68000/ints.c | 0 + arch/m68k/{platform => }/68000/m68328.c | 0 + arch/m68k/{platform => }/68000/m68EZ328.c | 0 + arch/m68k/{platform => }/68000/m68VZ328.c | 0 + arch/m68k/{platform => }/68000/romvec.S | 0 + arch/m68k/{platform => }/68000/timers.c | 0 + arch/m68k/{platform => }/68360/Makefile | 2 +- + arch/m68k/{platform => }/68360/commproc.c | 0 + arch/m68k/{platform => }/68360/config.c | 2 +- + arch/m68k/{platform => }/68360/entry.S | 2 +- + arch/m68k/{platform => }/68360/head-ram.S | 5 ++--- + arch/m68k/{platform => }/68360/head-rom.S | 5 ++--- + arch/m68k/{platform => }/68360/ints.c | 2 +- + arch/m68k/Makefile | 12 ++++++------ + arch/m68k/{platform => }/coldfire/Makefile | 0 + arch/m68k/{platform => }/coldfire/cache.c | 0 + arch/m68k/{platform => }/coldfire/clk.c | 0 + arch/m68k/{platform => }/coldfire/device.c | 0 + arch/m68k/{platform => }/coldfire/dma.c | 0 + arch/m68k/{platform => }/coldfire/dma_timer.c | 0 + arch/m68k/{platform => }/coldfire/entry.S | 2 +- + arch/m68k/{platform => }/coldfire/firebee.c | 0 + arch/m68k/{platform => }/coldfire/gpio.c | 0 + arch/m68k/{platform => }/coldfire/head.S | 0 + arch/m68k/{platform => }/coldfire/intc-2.c | 0 + arch/m68k/{platform => }/coldfire/intc-5249.c | 0 + arch/m68k/{platform => }/coldfire/intc-525x.c | 0 + arch/m68k/{platform => }/coldfire/intc-5272.c | 2 +- + arch/m68k/{platform => }/coldfire/intc-simr.c | 0 + arch/m68k/{platform => }/coldfire/intc.c | 0 + arch/m68k/{platform => }/coldfire/m5206.c | 2 +- + arch/m68k/{platform => }/coldfire/m520x.c | 2 +- + arch/m68k/{platform => }/coldfire/m523x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5249.c | 2 +- + arch/m68k/{platform => }/coldfire/m525x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5272.c | 2 +- + arch/m68k/{platform => }/coldfire/m527x.c | 4 ++-- + arch/m68k/{platform => }/coldfire/m528x.c | 2 +- + arch/m68k/{platform => }/coldfire/m5307.c | 2 +- + arch/m68k/{platform => }/coldfire/m53xx.c | 0 + arch/m68k/{platform => }/coldfire/m5407.c | 2 +- + arch/m68k/{platform => }/coldfire/m5441x.c | 0 + arch/m68k/{platform => }/coldfire/m54xx.c | 2 +- + arch/m68k/{platform => }/coldfire/mcf8390.c | 0 + arch/m68k/{platform => }/coldfire/nettel.c | 0 + arch/m68k/{platform => }/coldfire/pci.c | 0 + arch/m68k/{platform => }/coldfire/pit.c | 0 + arch/m68k/{platform => }/coldfire/reset.c | 0 + arch/m68k/{platform => }/coldfire/sltimers.c | 0 + arch/m68k/{platform => }/coldfire/timers.c | 0 + arch/m68k/{platform => }/coldfire/vectors.c | 2 +- + arch/m68k/platform/Makefile | 3 --- + 57 files changed, 30 insertions(+), 35 deletions(-) + rename arch/m68k/{platform => }/68000/Makefile (100%) + rename arch/m68k/{platform => }/68000/bootlogo-vz.h (100%) + rename arch/m68k/{platform => }/68000/bootlogo.h (100%) + rename arch/m68k/{platform => }/68000/entry.S (98%) + rename arch/m68k/{platform => }/68000/head.S (100%) + rename arch/m68k/{platform => }/68000/ints.c (100%) + rename arch/m68k/{platform => }/68000/m68328.c (100%) + rename arch/m68k/{platform => }/68000/m68EZ328.c (100%) + rename arch/m68k/{platform => }/68000/m68VZ328.c (100%) + rename arch/m68k/{platform => }/68000/romvec.S (100%) + rename arch/m68k/{platform => }/68000/timers.c (100%) + rename arch/m68k/{platform => }/68360/Makefile (81%) + rename arch/m68k/{platform => }/68360/commproc.c (100%) + rename arch/m68k/{platform => }/68360/config.c (98%) + rename arch/m68k/{platform => }/68360/entry.S (98%) + rename arch/m68k/{platform => }/68360/head-ram.S (99%) + rename arch/m68k/{platform => }/68360/head-rom.S (99%) + rename arch/m68k/{platform => }/68360/ints.c (98%) + rename arch/m68k/{platform => }/coldfire/Makefile (100%) + rename arch/m68k/{platform => }/coldfire/cache.c (100%) + rename arch/m68k/{platform => }/coldfire/clk.c (100%) + rename arch/m68k/{platform => }/coldfire/device.c (100%) + rename arch/m68k/{platform => }/coldfire/dma.c (100%) + rename arch/m68k/{platform => }/coldfire/dma_timer.c (100%) + rename arch/m68k/{platform => }/coldfire/entry.S (98%) + rename arch/m68k/{platform => }/coldfire/firebee.c (100%) + rename arch/m68k/{platform => }/coldfire/gpio.c (100%) + rename arch/m68k/{platform => }/coldfire/head.S (100%) + rename arch/m68k/{platform => }/coldfire/intc-2.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-5249.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-525x.c (100%) + rename arch/m68k/{platform => }/coldfire/intc-5272.c (99%) + rename arch/m68k/{platform => }/coldfire/intc-simr.c (100%) + rename arch/m68k/{platform => }/coldfire/intc.c (100%) + rename arch/m68k/{platform => }/coldfire/m5206.c (96%) + rename arch/m68k/{platform => }/coldfire/m520x.c (98%) + rename arch/m68k/{platform => }/coldfire/m523x.c (97%) + rename arch/m68k/{platform => }/coldfire/m5249.c (97%) + rename arch/m68k/{platform => }/coldfire/m525x.c (97%) + rename arch/m68k/{platform => }/coldfire/m5272.c (98%) + rename arch/m68k/{platform => }/coldfire/m527x.c (97%) + rename arch/m68k/{platform => }/coldfire/m528x.c (98%) + rename arch/m68k/{platform => }/coldfire/m5307.c (97%) + rename arch/m68k/{platform => }/coldfire/m53xx.c (100%) + rename arch/m68k/{platform => }/coldfire/m5407.c (95%) + rename arch/m68k/{platform => }/coldfire/m5441x.c (100%) + rename arch/m68k/{platform => }/coldfire/m54xx.c (98%) + rename arch/m68k/{platform => }/coldfire/mcf8390.c (100%) + rename arch/m68k/{platform => }/coldfire/nettel.c (100%) + rename arch/m68k/{platform => }/coldfire/pci.c (100%) + rename arch/m68k/{platform => }/coldfire/pit.c (100%) + rename arch/m68k/{platform => }/coldfire/reset.c (100%) + rename arch/m68k/{platform => }/coldfire/sltimers.c (100%) + rename arch/m68k/{platform => }/coldfire/timers.c (100%) + rename arch/m68k/{platform => }/coldfire/vectors.c (96%) + delete mode 100644 arch/m68k/platform/Makefile +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (e8bbef945111 arch/microblaze/include/asm/uaccess.h: Use pr_devel() instead of pr_debug()) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/entry.h | 1 + + arch/microblaze/include/asm/uaccess.h | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging mips/mips-for-linux-next (739c25724af0 Merge branch '3.17-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging include/asm-generic/dma-contiguous.h +Removing arch/mips/ralink/dts/Makefile +Removing arch/mips/netlogic/dts/Makefile +Removing arch/mips/lantiq/dts/Makefile +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging arch/mips/include/asm/pgtable.h +Removing arch/mips/cavium-octeon/.gitignore +Auto-merging arch/mips/Kconfig +Removing arch/arm64/include/asm/dma-contiguous.h +Merge made by the 'recursive' strategy. + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/dma-contiguous.h | 28 ----------- + arch/mips/Kconfig | 9 ++++ + arch/mips/Makefile | 11 ++++ + arch/mips/alchemy/devboards/db1300.c | 47 +++++++++++++++++- + arch/mips/alchemy/devboards/db1550.c | 9 ++-- + arch/mips/alchemy/devboards/platform.c | 3 ++ + arch/mips/bcm63xx/irq.c | 4 +- + arch/mips/boot/.gitignore | 1 + + arch/mips/boot/compressed/decompress.c | 1 + + arch/mips/boot/dts/Makefile | 20 ++++++++ + arch/mips/{lantiq => boot}/dts/danube.dtsi | 0 + arch/mips/{lantiq => boot}/dts/easy50712.dts | 0 + arch/mips/{ralink => boot}/dts/mt7620a.dtsi | 0 + arch/mips/{ralink => boot}/dts/mt7620a_eval.dts | 0 + .../{cavium-octeon => boot/dts}/octeon_3xxx.dts | 0 + .../{cavium-octeon => boot/dts}/octeon_68xx.dts | 0 + arch/mips/{ralink => boot}/dts/rt2880.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt2880_eval.dts | 0 + arch/mips/{ralink => boot}/dts/rt3050.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt3052_eval.dts | 0 + arch/mips/{ralink => boot}/dts/rt3883.dtsi | 0 + arch/mips/{ralink => boot}/dts/rt3883_eval.dts | 0 + arch/mips/{mti-sead3 => boot/dts}/sead3.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_evp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_fvp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_gvp.dts | 0 + arch/mips/{netlogic => boot}/dts/xlp_svp.dts | 0 + arch/mips/cavium-octeon/.gitignore | 2 - + arch/mips/cavium-octeon/Makefile | 10 ---- + arch/mips/configs/sead3_defconfig | 2 +- + arch/mips/configs/sead3micro_defconfig | 2 +- + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/cop2.h | 18 +++---- + arch/mips/include/asm/cpu-features.h | 10 ++++ + arch/mips/include/asm/cpu-info.h | 5 ++ + .../asm/mach-au1x00/cpu-feature-overrides.h | 12 +++++ + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 + + arch/mips/include/asm/mach-ip28/spaces.h | 7 --- + .../asm/mach-loongson/cpu-feature-overrides.h | 2 + + arch/mips/include/asm/page.h | 5 +- + arch/mips/include/asm/pgtable-bits.h | 44 ++++++++++------ + arch/mips/include/asm/pgtable.h | 10 ++++ + arch/mips/include/asm/switch_to.h | 4 +- + arch/mips/include/uapi/asm/swab.h | 18 +++++-- + arch/mips/include/uapi/asm/unistd.h | 18 ++++--- + arch/mips/kernel/cpu-probe.c | 21 ++++++++ + arch/mips/kernel/machine_kexec.c | 8 ++- + arch/mips/kernel/scall32-o32.S | 2 + + arch/mips/kernel/scall64-64.S | 2 + + arch/mips/kernel/scall64-n32.S | 2 + + arch/mips/kernel/scall64-o32.S | 2 + + arch/mips/kernel/setup.c | 9 ++++ + arch/mips/lantiq/Kconfig | 1 + + arch/mips/lantiq/Makefile | 2 - + arch/mips/lantiq/dts/Makefile | 1 - + arch/mips/lib/csum_partial.S | 10 +++- + arch/mips/mm/dma-default.c | 37 +++++++++----- + arch/mips/mti-sead3/Makefile | 4 -- + arch/mips/net/bpf_jit.c | 58 +++++++++------------- + arch/mips/netlogic/Kconfig | 4 ++ + arch/mips/netlogic/Makefile | 1 - + arch/mips/netlogic/dts/Makefile | 4 -- + arch/mips/ralink/Kconfig | 4 ++ + arch/mips/ralink/Makefile | 2 - + arch/mips/ralink/dts/Makefile | 4 -- + arch/x86/include/asm/Kbuild | 1 + + .../asm => include/asm-generic}/dma-contiguous.h | 7 +-- + 68 files changed, 322 insertions(+), 169 deletions(-) + delete mode 100644 arch/arm64/include/asm/dma-contiguous.h + create mode 100644 arch/mips/boot/dts/Makefile + rename arch/mips/{lantiq => boot}/dts/danube.dtsi (100%) + rename arch/mips/{lantiq => boot}/dts/easy50712.dts (100%) + rename arch/mips/{ralink => boot}/dts/mt7620a.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/mt7620a_eval.dts (100%) + rename arch/mips/{cavium-octeon => boot/dts}/octeon_3xxx.dts (100%) + rename arch/mips/{cavium-octeon => boot/dts}/octeon_68xx.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt2880.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt2880_eval.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt3050.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt3052_eval.dts (100%) + rename arch/mips/{ralink => boot}/dts/rt3883.dtsi (100%) + rename arch/mips/{ralink => boot}/dts/rt3883_eval.dts (100%) + rename arch/mips/{mti-sead3 => boot/dts}/sead3.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_evp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_fvp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_gvp.dts (100%) + rename arch/mips/{netlogic => boot}/dts/xlp_svp.dts (100%) + delete mode 100644 arch/mips/cavium-octeon/.gitignore + delete mode 100644 arch/mips/lantiq/dts/Makefile + delete mode 100644 arch/mips/netlogic/dts/Makefile + delete mode 100644 arch/mips/ralink/dts/Makefile + rename {arch/x86/include/asm => include/asm-generic}/dma-contiguous.h (57%) +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (c90f06943e05 parisc: Wire up seccomp, getrandom and memfd_create syscalls) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 16 ++++++++++++++++ + arch/parisc/hpux/sys_hpux.c | 2 +- + arch/parisc/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/parisc/include/asm/thread_info.h | 5 ++++- + arch/parisc/include/uapi/asm/unistd.h | 5 ++++- + arch/parisc/kernel/ptrace.c | 6 ++++++ + arch/parisc/kernel/syscall_table.S | 3 +++ + drivers/parisc/dino.c | 2 +- + 8 files changed, 51 insertions(+), 4 deletions(-) + create mode 100644 arch/parisc/include/asm/seccomp.h +Merging powerpc/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate) +$ git merge powerpc/next +Already up-to-date. +Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs) +$ git merge mpc5xxx/next +Already up-to-date. +Merging galak/next () +$ git merge galak/next +merge: galak/next - not something we can merge +$ git commit -v -a +On branch master +Untracked files: + drivers/base/dma-mapping.c.rej + +nothing added to commit but untracked files present +$ git diff -M --stat --summary HEAD^.. + arch/parisc/Kconfig | 16 ++++++++++++++++ + arch/parisc/hpux/sys_hpux.c | 2 +- + arch/parisc/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/parisc/include/asm/thread_info.h | 5 ++++- + arch/parisc/include/uapi/asm/unistd.h | 5 ++++- + arch/parisc/kernel/ptrace.c | 6 ++++++ + arch/parisc/kernel/syscall_table.S | 3 +++ + drivers/parisc/dino.c | 2 +- + 8 files changed, 51 insertions(+), 4 deletions(-) + create mode 100644 arch/parisc/include/asm/seccomp.h +Merging s390/features (f8a31c125632 s390/vdso: add vdso support for coarse clocks) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/kprobes.txt | 1 + + arch/s390/include/asm/ipl.h | 8 +- + arch/s390/include/asm/setup.h | 3 - + arch/s390/include/asm/vdso.h | 18 +++-- + arch/s390/kernel/asm-offsets.c | 7 ++ + arch/s390/kernel/early.c | 2 - + arch/s390/kernel/ipl.c | 128 +++++++++++++++++++++----------- + arch/s390/kernel/time.c | 12 +++ + arch/s390/kernel/vdso32/clock_getres.S | 11 ++- + arch/s390/kernel/vdso32/clock_gettime.S | 42 ++++++++--- + arch/s390/kernel/vdso32/gettimeofday.S | 4 +- + arch/s390/kernel/vdso64/clock_getres.S | 8 +- + arch/s390/kernel/vdso64/clock_gettime.S | 42 ++++++++--- + arch/s390/kernel/vdso64/gettimeofday.S | 4 +- + drivers/s390/block/dasd_devmap.c | 2 +- + 15 files changed, 203 insertions(+), 89 deletions(-) +Merging sparc-next/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (9c29b2aea7fa tile gxio: use better string copy primitive) +$ git merge tile/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1192 and retry the command. +Auto-merging arch/tile/Kconfig +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 1 + + arch/tile/gxio/mpipe.c | 37 ++++++++++++++++++++++++++++++----- + arch/tile/include/asm/sections.h | 3 --- + arch/tile/include/uapi/arch/sim_def.h | 10 +++++----- + arch/tile/kernel/traps.c | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 -- + arch/tile/mm/init.c | 12 ++++++------ + drivers/char/tile-srom.c | 13 +++++++++++- + 8 files changed, 57 insertions(+), 23 deletions(-) +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4420 and retry the command. +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Auto-merging arch/um/os-Linux/skas/process.c +Auto-merging arch/um/kernel/trap.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f832b79536df] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (e792290be763 Merge tag 'xtensa-for-next-20140815' into for_next) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (8d875f95da43 btrfs: disable strict file flushes for renames and truncates) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (5f740d7e1531 libceph: set last_piece in ceph_msg_data_pages_cursor_init() correctly) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (ca5d13fc33cc Clarify Kconfig help text for CIFS and SMB2/SMB3) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/Kconfig | 35 +++++++++++++++++++++++------------ + fs/cifs/cifsglob.h | 5 ----- + fs/cifs/connect.c | 21 ++------------------- + fs/cifs/dir.c | 8 ++++++++ + fs/cifs/file.c | 8 ++++++++ + fs/cifs/inode.c | 5 ++++- + fs/cifs/readdir.c | 4 ++-- + fs/cifs/sess.c | 7 ++++--- + fs/cifs/smb2file.c | 2 +- + fs/cifs/smb2inode.c | 2 +- + fs/cifs/smb2ops.c | 4 ++-- + fs/cifs/smb2pdu.c | 7 +++---- + 12 files changed, 58 insertions(+), 50 deletions(-) +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (04ec5f5c0022 ecryptfs: remove unnecessary break after goto) +$ git merge ecryptfs/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 4422 and retry the command. +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/file.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/file.c | 4 ++-- + fs/ecryptfs/inode.c | 16 +++++++--------- + fs/ecryptfs/keystore.c | 2 -- + fs/ecryptfs/messaging.c | 3 +-- + 4 files changed, 10 insertions(+), 15 deletions(-) +Merging ext3/for_next (e6d8fb340f20 ext3: Count internal journal as bsddf overhead in ext3_statfs) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (6bf70f3599f9 jbd2: optimize jbd2_log_do_checkpoint() a bit) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 3 +- + fs/ext4/dir.c | 8 +- + fs/ext4/ext4.h | 33 +- + fs/ext4/ext4_extents.h | 1 + + fs/ext4/extents.c | 593 ++++++++++++++++--------- + fs/ext4/extents_status.c | 200 ++++++++- + fs/ext4/extents_status.h | 13 +- + fs/ext4/indirect.c | 86 ++-- + fs/ext4/inode.c | 84 ++-- + fs/ext4/mballoc.c | 12 +- + fs/ext4/migrate.c | 11 +- + fs/ext4/move_extent.c | 1009 +++++-------------------------------------- + fs/ext4/namei.c | 195 ++++----- + fs/ext4/super.c | 33 +- + fs/ext4/xattr.c | 6 - + fs/jbd2/checkpoint.c | 271 +++++------- + include/trace/events/ext4.h | 59 ++- + 17 files changed, 1054 insertions(+), 1563 deletions(-) +Merging f2fs/dev (b73e52824c89 f2fs: reposition unlock_new_inode to prevent accessing invalid inode) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 4 +-- + fs/f2fs/checkpoint.c | 80 +++++++++++++++++++++++++++++++------------------ + fs/f2fs/data.c | 19 ++++++++---- + fs/f2fs/debug.c | 4 +-- + fs/f2fs/dir.c | 6 ++-- + fs/f2fs/f2fs.h | 26 ++++++++-------- + fs/f2fs/file.c | 60 +++++++++++++++++++++++-------------- + fs/f2fs/gc.c | 8 ++--- + fs/f2fs/gc.h | 2 +- + fs/f2fs/hash.c | 7 +++-- + fs/f2fs/inline.c | 38 +++++++++++++---------- + fs/f2fs/namei.c | 23 ++++---------- + fs/f2fs/node.c | 80 +++++++++++++++++++++++-------------------------- + fs/f2fs/recovery.c | 30 ++++++++++++++----- + fs/f2fs/segment.c | 53 ++------------------------------ + fs/f2fs/segment.h | 2 +- + fs/f2fs/super.c | 32 ++++++++++++++------ + fs/f2fs/xattr.c | 2 +- + include/linux/f2fs_fs.h | 16 ++++++++-- + 19 files changed, 261 insertions(+), 231 deletions(-) +Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree) +$ git merge fscache/fscache +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3268 and retry the command. +Merge made by the 'recursive' strategy. +Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (2ddfbdd6848d GFS2: Request demote when a "try" flock fails) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 9 +++++---- + fs/gfs2/file.c | 15 ++++++++++++--- + fs/gfs2/super.c | 20 ++++++++++---------- + 3 files changed, 27 insertions(+), 17 deletions(-) +Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr) +$ git merge jfs/jfs-next +Already up-to-date. +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 13499 and retry the command. +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (7505ceaf8635 Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (b06556167d91 locks: Remove unused conf argument from lm_grant) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfs_common/grace.c +Merge made by the 'recursive' strategy. + fs/Kconfig | 6 +- + fs/dlm/plock.c | 8 +- + fs/lockd/Makefile | 2 +- + fs/lockd/netns.h | 1 - + fs/lockd/svc.c | 3 +- + fs/lockd/svclock.c | 12 +-- + fs/nfs/callback.c | 1 + + fs/nfs_common/Makefile | 3 +- + fs/{lockd => nfs_common}/grace.c | 68 +++++++++++-- + fs/nfsd/Kconfig | 4 +- + fs/nfsd/cache.h | 1 - + fs/nfsd/export.c | 1 + + fs/nfsd/nfs3proc.c | 13 ++- + fs/nfsd/nfs4state.c | 32 +++--- + fs/nfsd/nfs4xdr.c | 15 +-- + fs/nfsd/nfscache.c | 214 +++++++++++++++++++++------------------ + fs/nfsd/nfsd.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/nfs4.h | 3 +- + include/linux/proc_fs.h | 2 + + include/linux/sunrpc/svc.h | 1 - + include/uapi/linux/nfsd/export.h | 5 +- + net/sunrpc/svc.c | 2 - + net/sunrpc/svc_xprt.c | 81 ++++++--------- + net/sunrpc/svcsock.c | 25 ++--- + 25 files changed, 275 insertions(+), 232 deletions(-) + rename fs/{lockd => nfs_common}/grace.c (50%) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (25601a3c9737 UBIFS: Add log overlap assertions) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (41b9d7263ea1 xfs: trim eofblocks before collapse range) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_bmap.c | 18 +++++++------- + fs/xfs/xfs_aops.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_bmap_util.c | 20 ++++++++++++++++ + fs/xfs/xfs_file.c | 27 +++++++++++++++++---- + 4 files changed, 114 insertions(+), 12 deletions(-) +Merging file-private-locks/linux-next () +$ git merge file-private-locks/linux-next +merge: file-private-locks/linux-next - not something we can merge +$ git commit -v -a +On branch master +Untracked files: + drivers/base/dma-mapping.c.rej + +nothing added to commit but untracked files present +$ git diff -M --stat --summary HEAD^.. + fs/xfs/libxfs/xfs_bmap.c | 18 +++++++------- + fs/xfs/xfs_aops.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_bmap_util.c | 20 ++++++++++++++++ + fs/xfs/xfs_file.c | 27 +++++++++++++++++---- + 4 files changed, 114 insertions(+), 12 deletions(-) +Merging vfs/for-next (7b0527f875b1 fs: namespace: suppress 'may be used uninitialized' warnings) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +Auto-merging fs/cifs/readdir.c +Auto-merging fs/cifs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging drivers/staging/android/logger.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/vfs.txt | 2 +- + arch/x86/ia32/ia32_aout.c | 21 +-- + drivers/block/rsxx/core.c | 81 +++-------- + drivers/bluetooth/hci_vhci.c | 22 ++- + drivers/char/mem.c | 56 ++------ + drivers/dma-buf/dma-buf.c | 2 +- + drivers/misc/carma/carma-fpga-program.c | 30 +--- + drivers/staging/android/ashmem.c | 2 +- + drivers/staging/android/logger.c | 103 ++++---------- + drivers/staging/vme/devices/vme_user.c | 28 +--- + fs/9p/fid.c | 4 +- + fs/9p/vfs_addr.c | 4 +- + fs/9p/vfs_dentry.c | 8 +- + fs/9p/vfs_dir.c | 4 +- + fs/9p/vfs_file.c | 8 +- + fs/9p/vfs_inode.c | 32 ++--- + fs/9p/vfs_inode_dotl.c | 8 +- + fs/afs/dir.c | 5 - + fs/binfmt_aout.c | 25 +--- + fs/binfmt_elf.c | 25 +--- + fs/binfmt_elf_fdpic.c | 24 ++-- + fs/btrfs/ioctl.c | 5 +- + fs/buffer.c | 5 + + fs/cachefiles/rdwr.c | 48 +++---- + fs/ceph/dir.c | 1 - + fs/cifs/dir.c | 14 +- + fs/cifs/file.c | 12 +- + fs/cifs/inode.c | 12 +- + fs/cifs/readdir.c | 6 +- + fs/compat.c | 10 +- + fs/dcache.c | 174 +++++++++-------------- + fs/exec.c | 17 ++- + fs/fuse/dir.c | 7 +- + fs/gfs2/dentry.c | 3 - + fs/internal.h | 2 +- + fs/jffs2/jffs2_fs_sb.h | 2 - + fs/jffs2/wbuf.c | 17 +-- + fs/kernfs/dir.c | 11 -- + fs/mount.h | 25 +++- + fs/namei.c | 22 +-- + fs/namespace.c | 194 ++++++++++++++++++++------ + fs/nfs/dir.c | 7 +- + fs/pnode.c | 1 + + fs/proc/base.c | 10 +- + fs/proc/fd.c | 2 - + fs/read_write.c | 2 + + fs/super.c | 2 + + include/linux/dcache.h | 3 +- + include/linux/fs.h | 2 +- + include/linux/uio.h | 3 + + kernel/printk/printk.c | 20 +-- + mm/iov_iter.c | 240 ++++++++++++++++++++++++++++++-- + tools/perf/util/string.c | 90 ++++-------- + 53 files changed, 725 insertions(+), 738 deletions(-) +Merging pci/next (52addcf9d666 Linux 3.17-rc2) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (d419a1c245dd Merge branch 'for-3.18/sony' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-class-hid-driver-gt683r | 14 + + Documentation/hid/uhid.txt | 179 +++++----- + drivers/hid/hid-input.c | 6 + + drivers/hid/hid-logitech-dj.c | 35 +- + drivers/hid/hid-picolcd_core.c | 4 +- + drivers/hid/hid-sony.c | 3 +- + drivers/hid/uhid.c | 394 ++++++++++++--------- + include/uapi/linux/uhid.h | 120 +++++-- + 8 files changed, 443 insertions(+), 312 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-hid-driver-gt683r +Merging i2c/i2c/for-next (75b81f339c6a i2c: at91: add bound checking on SMBus block length bytes) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + drivers/i2c/busses/i2c-at91.c | 32 ++++++++++++++++++++++++++------ + drivers/i2c/busses/i2c-mv64xxx.c | 3 +-- + drivers/i2c/busses/i2c-rcar.c | 15 +++++++++------ + drivers/i2c/busses/i2c-rk3x.c | 4 ++++ + 4 files changed, 40 insertions(+), 14 deletions(-) +Merging jdelvare-hwmon/master (c7208164e66f Linux 3.15-rc7) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (ce95e1886a5f MAINTAINERS: add entry for the PWM fan driver) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/hwmon/k10temp | 2 +- + MAINTAINERS | 8 +++ + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/ads1015.c | 21 +++--- + drivers/hwmon/da9052-hwmon.c | 54 +++------------ + drivers/hwmon/da9055-hwmon.c | 52 +++----------- + drivers/hwmon/ds1621.c | 1 + + drivers/hwmon/k10temp.c | 157 ++++++++++++++++++++++--------------------- + 8 files changed, 117 insertions(+), 182 deletions(-) +Merging v4l-dvb/master (d1352f268415 Merge two fixes from branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1127 and retry the command. +Merge made by the 'recursive' strategy. + drivers/media/dvb-frontends/si2168.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kbuild/for-next (c7377ed8b9eb Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.txt | 94 ++++++---------- + Documentation/lto-build | 173 +++++++++++++++++++++++++++++ + Makefile | 19 +++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.build | 10 +- + scripts/Makefile.host | 6 +- + scripts/Makefile.lib | 9 ++ + scripts/Makefile.lto | 84 ++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/bootgraph.pl | 0 + scripts/export_report.pl | 0 + scripts/gcc-goto.sh | 0 + scripts/gcc-ld | 0 + scripts/gcc-version.sh | 0 + scripts/gcc-x86_32-has-stack-protector.sh | 0 + scripts/gcc-x86_64-has-stack-protector.sh | 0 + scripts/gen_initramfs_list.sh | 0 + scripts/headers_check.pl | 0 + scripts/headers_install.sh | 0 + scripts/kconfig/Makefile | 38 +------ + scripts/kconfig/lxdialog/check-lxdialog.sh | 0 + scripts/kconfig/lxdialog/dialog.h | 2 +- + scripts/kconfig/streamline_config.pl | 0 + scripts/link-vmlinux.sh | 2 +- + scripts/markup_oops.pl | 0 + scripts/mkmakefile | 0 + scripts/mksysmap | 0 + scripts/package/builddeb | 22 ++-- + scripts/package/buildtar | 0 + scripts/profile2linkerlist.pl | 0 + scripts/rt-tester/rt-tester.py | 0 + scripts/selinux/install_policy.sh | 0 + scripts/tags.sh | 10 +- + scripts/tracing/draw_functrace.py | 0 + scripts/xz_wrap.sh | 0 + 38 files changed, 425 insertions(+), 130 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto + mode change 100644 => 100755 scripts/bootgraph.pl + mode change 100644 => 100755 scripts/export_report.pl + mode change 100644 => 100755 scripts/gcc-goto.sh + mode change 100644 => 100755 scripts/gcc-ld + mode change 100644 => 100755 scripts/gcc-version.sh + mode change 100644 => 100755 scripts/gcc-x86_32-has-stack-protector.sh + mode change 100644 => 100755 scripts/gcc-x86_64-has-stack-protector.sh + mode change 100644 => 100755 scripts/gen_initramfs_list.sh + mode change 100644 => 100755 scripts/headers_check.pl + mode change 100644 => 100755 scripts/headers_install.sh + mode change 100644 => 100755 scripts/kconfig/lxdialog/check-lxdialog.sh + mode change 100644 => 100755 scripts/kconfig/streamline_config.pl + mode change 100644 => 100755 scripts/link-vmlinux.sh + mode change 100644 => 100755 scripts/markup_oops.pl + mode change 100644 => 100755 scripts/mkmakefile + mode change 100644 => 100755 scripts/mksysmap + mode change 100644 => 100755 scripts/package/builddeb + mode change 100644 => 100755 scripts/package/buildtar + mode change 100644 => 100755 scripts/profile2linkerlist.pl + mode change 100644 => 100755 scripts/rt-tester/rt-tester.py + mode change 100644 => 100755 scripts/selinux/install_policy.sh + mode change 100644 => 100755 scripts/tracing/draw_functrace.py + mode change 100644 => 100755 scripts/xz_wrap.sh +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (ec0322e4423a Merge branch 'for-3.17-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 3 +-- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 3 +-- + arch/blackfin/mach-bf537/boards/stamp.c | 3 +-- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 3 +-- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 3 +-- + drivers/ata/ahci.c | 22 +++++++++++++++++++++- + drivers/ata/ahci_platform.c | 18 +----------------- + drivers/ata/ahci_tegra.c | 14 ++++++++++---- + drivers/ata/ata_piix.c | 8 ++++++++ + drivers/ata/libahci_platform.c | 29 ++--------------------------- + drivers/ata/libata-core.c | 2 +- + drivers/ata/pata_jmicron.c | 12 ++++++++++++ + drivers/ata/pata_of_platform.c | 24 ++++++------------------ + drivers/ata/pata_platform.c | 4 +--- + include/linux/ahci_platform.h | 13 ------------- + include/linux/ata_platform.h | 5 ----- + 16 files changed, 67 insertions(+), 99 deletions(-) +Merging pm/linux-next (a251c37e85be Merge branches 'acpica', 'acpi-video' and 'acpi-ec') +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + drivers/acpi/acpica/nsprepkg.c | 39 ++++++++++++++++++++++++++++++++++++ + drivers/acpi/ec.c | 4 ++++ + drivers/acpi/video.c | 45 ++++++++++++++++++++++++++++++++++++++++-- + 3 files changed, 86 insertions(+), 2 deletions(-) +Merging idle/next (e7c95ff32d00 tools/power turbostat: tweak whitespace in output format) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (47d104ba5879 Merge branches 'exynos-fix', 'for-rc', 'int3403-fix', 'misc', 'rcar-thermal' and 'sti-thermal' of .git into next) +$ git merge thermal/next +Already up-to-date. +Merging ieee1394/for-next (d584a6627994 firewire: ohci: disable MSI for VIA VT6315 again) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (883854c5457a dlm: keep listening connection alive with sctp mode) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (bebbbb764e5b Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/rcar-audmapp.txt | 6 +- + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 65 ++++++++++++++++++++++ + Documentation/dmaengine.txt | 4 +- + drivers/dma/imx-sdma.c | 33 ++++++++--- + drivers/dma/sh/rcar-audmapp.c | 15 +++-- + drivers/dma/xilinx/xilinx_vdma.c | 1 - + 6 files changed, 106 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_dma.txt +Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()) +$ git merge dmaengine/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 3246 and retry the command. +Auto-merging drivers/dma/mv_xor.c +Merge made by the 'recursive' strategy. + drivers/dma/ioat/dca.c | 13 ++++---- + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma_v3.c | 6 ++-- + drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++---------- + 4 files changed, 74 insertions(+), 27 deletions(-) +Merging net-next/master (10770bc2d170 qdisc: adjustments for API allowing skb list xmits) +$ git merge net-next/master +Removing net/tipc/ref.h +Removing net/tipc/ref.c +Removing net/tipc/port.h +Removing net/tipc/port.c +Auto-merging net/core/sock.c +Auto-merging net/core/dev.c +Removing include/rxrpc/types.h +Removing include/linux/phonedev.h +Auto-merging include/linux/mlx4/device.h +Removing include/linux/i82593.h +Removing include/linux/cycx_x25.h +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +Auto-merging drivers/net/ethernet/intel/i40evf/i40e_txrx.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/broadcom-mdio-unimac.txt | 39 + + .../devicetree/bindings/net/broadcom-sf2.txt | 78 ++ + .../devicetree/bindings/net/can/m_can.txt | 67 ++ + .../devicetree/bindings/net/can/rcar_can.txt | 43 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 17 + + .../devicetree/bindings/net/socfpga-dwmac.txt | 4 + + Documentation/networking/ip-sysctl.txt | 6 + + Documentation/networking/timestamping.txt | 368 ++++-- + Documentation/networking/timestamping/Makefile | 10 +- + .../networking/timestamping/txtimestamp.c | 470 ++++++++ + Documentation/sysctl/net.txt | 16 + + MAINTAINERS | 2 +- + arch/x86/net/bpf_jit_comp.c | 42 + + drivers/isdn/gigaset/bas-gigaset.c | 2 +- + drivers/isdn/gigaset/usb-gigaset.c | 2 +- + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/bonding/bond_netlink.c | 29 + + drivers/net/bonding/bond_options.c | 2 + + drivers/net/can/Kconfig | 2 + + drivers/net/can/Makefile | 3 +- + drivers/net/can/c_can/Makefile | 2 - + drivers/net/can/cc770/Makefile | 2 - + drivers/net/can/dev.c | 3 +- + drivers/net/can/flexcan.c | 111 +- + drivers/net/can/m_can/Kconfig | 4 + + drivers/net/can/m_can/Makefile | 5 + + drivers/net/can/m_can/m_can.c | 1202 ++++++++++++++++++++ + drivers/net/can/mscan/Makefile | 2 - + drivers/net/can/rcar_can.c | 66 +- + drivers/net/can/sja1000/Makefile | 2 - + drivers/net/can/softing/Makefile | 2 - + drivers/net/can/spi/Makefile | 2 - + drivers/net/can/spi/mcp251x.c | 16 +- + drivers/net/can/usb/Makefile | 2 - + drivers/net/dsa/Kconfig | 11 + + drivers/net/dsa/Makefile | 1 + + drivers/net/dsa/bcm_sf2.c | 626 ++++++++++ + drivers/net/dsa/bcm_sf2.h | 140 +++ + drivers/net/dsa/bcm_sf2_regs.h | 227 ++++ + drivers/net/ethernet/arc/Kconfig | 8 +- + drivers/net/ethernet/arc/Makefile | 3 +- + drivers/net/ethernet/arc/emac.h | 6 +- + drivers/net/ethernet/arc/emac_arc.c | 95 ++ + drivers/net/ethernet/arc/emac_main.c | 127 +-- + drivers/net/ethernet/arc/emac_mdio.c | 7 +- + drivers/net/ethernet/broadcom/Kconfig | 1 + + drivers/net/ethernet/broadcom/bcmsysport.c | 9 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 40 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 128 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h | 14 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 42 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h | 222 ++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 229 ++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 844 ++++++++++++-- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 178 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 130 ++- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h | 62 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 48 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 9 - + drivers/net/ethernet/broadcom/cnic.c | 6 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 152 +-- + drivers/net/ethernet/ec_bhf.c | 101 +- + drivers/net/ethernet/emulex/benet/be.h | 28 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 14 +- + drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 35 + + drivers/net/ethernet/emulex/benet/be_hw.h | 12 + + drivers/net/ethernet/emulex/benet/be_main.c | 289 ++--- + drivers/net/ethernet/intel/i40e/i40e.h | 8 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 15 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 216 +++- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 90 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 9 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 87 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 66 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 218 +++- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 156 ++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 6 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 10 +- + drivers/net/ethernet/realtek/r8169.c | 472 +++++++- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 62 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 34 +- + drivers/net/hyperv/hyperv_net.h | 4 +- + drivers/net/hyperv/netvsc.c | 16 +- + drivers/net/phy/Kconfig | 8 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/bcm7xxx.c | 116 +- + drivers/net/phy/broadcom.c | 122 -- + drivers/net/phy/dp83640.c | 23 +- + drivers/net/phy/fixed.c | 11 + + drivers/net/phy/mdio-bcm-unimac.c | 213 ++++ + drivers/net/phy/mdio_bus.c | 8 +- + drivers/net/phy/phy.c | 12 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/sungem_phy.c | 304 ++--- + drivers/net/team/team.c | 44 +- + drivers/net/usb/r8152.c | 92 +- + drivers/net/virtio_net.c | 4 +- + drivers/net/vxlan.c | 4 +- + drivers/net/wan/dlci.c | 6 +- + drivers/usb/gadget/function/f_ncm.c | 8 + + include/linux/brcmphy.h | 132 ++- + include/linux/cycx_x25.h | 125 -- + include/linux/i82593.h | 229 ---- + include/linux/mlx4/device.h | 3 +- + include/linux/netdevice.h | 155 ++- + include/linux/phonedev.h | 25 - + include/linux/phy.h | 27 + + include/linux/phy_fixed.h | 17 +- + include/linux/random.h | 4 +- + include/linux/skbuff.h | 137 ++- + include/linux/tcp.h | 2 +- + include/linux/udp.h | 16 +- + include/net/codel.h | 2 +- + include/net/dsa.h | 43 +- + include/net/flow_keys.h | 14 +- + include/net/ip.h | 8 + + include/net/ip6_checksum.h | 8 + + include/net/pkt_sched.h | 2 +- + include/net/sock.h | 1 + + include/net/udp.h | 18 + + include/rxrpc/types.h | 41 - + include/uapi/linux/if_ether.h | 1 + + kernel/crash_dump.c | 1 + + lib/random32.c | 39 +- + lib/test_bpf.c | 38 + + net/atm/mpc.c | 2 +- + net/bridge/br_multicast.c | 2 +- + net/core/dev.c | 285 +++-- + net/core/flow_dissector.c | 69 +- + net/core/netpoll.c | 7 +- + net/core/pktgen.c | 28 +- + net/core/rtnetlink.c | 66 +- + net/core/secure_seq.c | 6 +- + net/core/skbuff.c | 20 + + net/core/sock.c | 22 +- + net/decnet/af_decnet.c | 3 +- + net/decnet/dn_dev.c | 3 +- + net/decnet/dn_timer.c | 3 +- + net/dsa/Kconfig | 3 + + net/dsa/Makefile | 1 + + net/dsa/dsa.c | 48 +- + net/dsa/dsa_priv.h | 16 +- + net/dsa/slave.c | 165 ++- + net/dsa/tag_brcm.c | 173 +++ + net/dsa/tag_dsa.c | 8 +- + net/dsa/tag_edsa.c | 8 +- + net/dsa/tag_trailer.c | 8 +- + net/ethernet/eth.c | 7 +- + net/ipv4/fib_frontend.c | 14 +- + net/ipv4/gre_demux.c | 4 + + net/ipv4/gre_offload.c | 44 +- + net/ipv4/igmp.c | 2 +- + net/ipv4/inet_hashtables.c | 2 +- + net/ipv4/ip_sockglue.c | 15 +- + net/ipv4/ipconfig.c | 3 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp_bic.c | 11 +- + net/ipv4/tcp_cong.c | 5 +- + net/ipv4/tcp_cubic.c | 18 +- + net/ipv4/tcp_diag.c | 5 +- + net/ipv4/tcp_highspeed.c | 145 ++- + net/ipv4/tcp_htcp.c | 6 +- + net/ipv4/tcp_hybla.c | 1 - + net/ipv4/tcp_illinois.c | 3 +- + net/ipv4/tcp_input.c | 26 +- + net/ipv4/tcp_ipv4.c | 5 +- + net/ipv4/tcp_offload.c | 27 +- + net/ipv4/tcp_probe.c | 6 +- + net/ipv4/tcp_scalable.c | 2 +- + net/ipv4/tcp_vegas.c | 3 - + net/ipv4/tcp_veno.c | 1 - + net/ipv4/tcp_westwood.c | 7 +- + net/ipv4/tcp_yeah.c | 9 +- + net/ipv4/udp.c | 11 +- + net/ipv4/udp_offload.c | 71 +- + net/ipv6/addrconf.c | 12 +- + net/ipv6/af_inet6.c | 12 +- + net/ipv6/ah6.c | 21 +- + net/ipv6/datagram.c | 23 +- + net/ipv6/esp6.c | 15 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/icmp.c | 10 +- + net/ipv6/inet6_connection_sock.c | 6 +- + net/ipv6/inet6_hashtables.c | 7 +- + net/ipv6/ip6_flowlabel.c | 19 +- + net/ipv6/ip6_icmp.c | 2 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_offload.c | 2 +- + net/ipv6/ip6_output.c | 21 +- + net/ipv6/ip6_tunnel.c | 32 +- + net/ipv6/ip6mr.c | 4 +- + net/ipv6/ipcomp6.c | 6 +- + net/ipv6/ipv6_sockglue.c | 26 +- + net/ipv6/mcast.c | 100 +- + net/ipv6/mip6.c | 10 +- + net/ipv6/ndisc.c | 17 +- + net/ipv6/output_core.c | 2 +- + net/ipv6/proc.c | 2 +- + net/ipv6/raw.c | 8 +- + net/ipv6/reassembly.c | 12 +- + net/ipv6/route.c | 22 +- + net/ipv6/sit.c | 12 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcpv6_offload.c | 26 +- + net/ipv6/tunnel6.c | 4 +- + net/ipv6/udp.c | 26 +- + net/ipv6/udp_offload.c | 43 + + net/ipv6/xfrm6_input.c | 6 +- + net/ipv6/xfrm6_output.c | 1 - + net/ipv6/xfrm6_policy.c | 22 +- + net/ipv6/xfrm6_state.c | 14 +- + net/ipv6/xfrm6_tunnel.c | 4 +- + net/l2tp/l2tp_core.c | 2 + + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_expect.c | 3 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_nat_core.c | 5 +- + net/netfilter/xt_HMARK.c | 2 +- + net/netfilter/xt_cluster.c | 3 +- + net/netfilter/xt_hashlimit.c | 2 +- + net/openvswitch/flow.c | 2 +- + net/packet/af_packet.c | 12 +- + net/rxrpc/ar-error.c | 14 +- + net/rxrpc/ar-input.c | 9 +- + net/sched/act_police.c | 4 +- + net/sched/sch_fq.c | 4 +- + net/sched/sch_fq_codel.c | 3 +- + net/sched/sch_generic.c | 21 +- + net/sched/sch_htb.c | 6 +- + net/sched/sch_tbf.c | 6 +- + net/sched/sch_teql.c | 5 +- + net/sctp/input.c | 8 +- + net/tipc/Makefile | 2 +- + net/tipc/bcast.c | 8 +- + net/tipc/config.c | 4 +- + net/tipc/core.c | 9 +- + net/tipc/core.h | 6 +- + net/tipc/link.c | 120 +- + net/tipc/link.h | 7 +- + net/tipc/msg.c | 38 +- + net/tipc/msg.h | 5 + + net/tipc/name_distr.c | 139 ++- + net/tipc/name_distr.h | 1 + + net/tipc/name_table.c | 9 +- + net/tipc/net.c | 3 +- + net/tipc/node.c | 90 ++ + net/tipc/node.h | 7 +- + net/tipc/port.c | 514 --------- + net/tipc/port.h | 190 ---- + net/tipc/ref.c | 266 ----- + net/tipc/ref.h | 48 - + net/tipc/socket.c | 884 +++++++++++--- + net/tipc/socket.h | 55 +- + net/tipc/subscr.c | 1 - + net/tipc/sysctl.c | 7 + + 282 files changed, 10193 insertions(+), 4441 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/broadcom-mdio-unimac.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-sf2.txt + create mode 100644 Documentation/devicetree/bindings/net/can/m_can.txt + create mode 100644 Documentation/devicetree/bindings/net/can/rcar_can.txt + create mode 100644 Documentation/networking/timestamping/txtimestamp.c + create mode 100644 drivers/net/can/m_can/Kconfig + create mode 100644 drivers/net/can/m_can/Makefile + create mode 100644 drivers/net/can/m_can/m_can.c + create mode 100644 drivers/net/dsa/bcm_sf2.c + create mode 100644 drivers/net/dsa/bcm_sf2.h + create mode 100644 drivers/net/dsa/bcm_sf2_regs.h + create mode 100644 drivers/net/ethernet/arc/emac_arc.c + create mode 100644 drivers/net/phy/mdio-bcm-unimac.c + delete mode 100644 include/linux/cycx_x25.h + delete mode 100644 include/linux/i82593.h + delete mode 100644 include/linux/phonedev.h + delete mode 100644 include/rxrpc/types.h + create mode 100644 net/dsa/tag_brcm.c + delete mode 100644 net/tipc/port.c + delete mode 100644 net/tipc/port.h + delete mode 100644 net/tipc/ref.c + delete mode 100644 net/tipc/ref.h +Merging ipsec-next/master (0244790c8ad2 xfrm: remove useless hash_resize_mutex locks) +$ git merge ipsec-next/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_state.c | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) +Merging wireless-next/master (6a5d088a9238 carl9170: tx: Replace rcu_assign_pointer() with RCU_INIT_POINTER()) +$ git merge wireless-next/master +Auto-merging net/mac802154/wpan.c +Auto-merging net/ieee802154/6lowpan_rtnl.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_core.c +Auto-merging include/net/bluetooth/hci_core.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 11 +- + drivers/bcma/host_soc.c | 4 + + drivers/bcma/scan.c | 11 +- + drivers/bluetooth/ath3k.c | 2 + + drivers/bluetooth/bluecard_cs.c | 35 +- + drivers/bluetooth/bt3c_cs.c | 27 +- + drivers/bluetooth/btuart_cs.c | 27 +- + drivers/bluetooth/btusb.c | 1 + + drivers/bluetooth/dtl1_cs.c | 36 +- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/net/wireless/ath/ath10k/Makefile | 1 + + drivers/net/wireless/ath/ath10k/bmi.c | 52 +- + drivers/net/wireless/ath/ath10k/ce.c | 185 ++- + drivers/net/wireless/ath/ath10k/ce.h | 28 +- + drivers/net/wireless/ath/ath10k/core.c | 246 ++-- + drivers/net/wireless/ath/ath10k/core.h | 66 +- + drivers/net/wireless/ath/ath10k/debug.c | 339 +++++- + drivers/net/wireless/ath/ath10k/debug.h | 34 +- + drivers/net/wireless/ath/ath10k/htc.c | 115 +- + drivers/net/wireless/ath/ath10k/htc.h | 7 +- + drivers/net/wireless/ath/ath10k/htt.c | 9 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 171 ++- + drivers/net/wireless/ath/ath10k/htt_tx.c | 46 +- + drivers/net/wireless/ath/ath10k/hw.h | 5 +- + drivers/net/wireless/ath/ath10k/mac.c | 717 +++++++----- + drivers/net/wireless/ath/ath10k/mac.h | 6 +- + drivers/net/wireless/ath/ath10k/pci.c | 1537 +++++++++++-------------- + drivers/net/wireless/ath/ath10k/pci.h | 104 +- + drivers/net/wireless/ath/ath10k/spectral.c | 561 +++++++++ + drivers/net/wireless/ath/ath10k/spectral.h | 90 ++ + drivers/net/wireless/ath/ath10k/txrx.c | 17 +- + drivers/net/wireless/ath/ath10k/wmi.c | 1089 ++++++++++++++---- + drivers/net/wireless/ath/ath10k/wmi.h | 699 +++++++++-- + drivers/net/wireless/ath/ath5k/attach.c | 3 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath5k/led.c | 1 + + drivers/net/wireless/ath/ath6kl/init.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 2 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 1 + + drivers/net/wireless/ath/ath6kl/usb.c | 21 +- + drivers/net/wireless/ath/ath9k/Kconfig | 9 + + drivers/net/wireless/ath/ath9k/ath9k.h | 136 ++- + drivers/net/wireless/ath/ath9k/beacon.c | 59 +- + drivers/net/wireless/ath/ath9k/channel.c | 1291 +++++++++++++++------ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/init.c | 83 +- + drivers/net/wireless/ath/ath9k/main.c | 462 ++------ + drivers/net/wireless/ath/ath9k/recv.c | 13 +- + drivers/net/wireless/ath/ath9k/spectral.h | 71 +- + drivers/net/wireless/ath/ath9k/wow.c | 3 +- + drivers/net/wireless/ath/ath9k/xmit.c | 7 +- + drivers/net/wireless/ath/carl9170/main.c | 11 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/ath/spectral_common.h | 113 ++ + drivers/net/wireless/ath/wil6210/cfg80211.c | 6 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 331 ++++-- + drivers/net/wireless/ath/wil6210/interrupt.c | 2 +- + drivers/net/wireless/ath/wil6210/main.c | 30 +- + drivers/net/wireless/ath/wil6210/netdev.c | 8 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 7 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 16 + + drivers/net/wireless/ath/wil6210/txrx.c | 3 +- + drivers/net/wireless/ath/wil6210/txrx.h | 2 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 17 +- + drivers/net/wireless/ath/wil6210/wmi.c | 47 +- + drivers/net/wireless/ath/wil6210/wmi.h | 4 +- + drivers/net/wireless/atmel_cs.c | 22 +- + drivers/net/wireless/b43/Makefile | 1 + + drivers/net/wireless/b43/b43.h | 18 + + drivers/net/wireless/b43/bus.c | 10 + + drivers/net/wireless/b43/bus.h | 15 + + drivers/net/wireless/b43/main.c | 17 +- + drivers/net/wireless/b43/phy_a.c | 4 +- + drivers/net/wireless/b43/phy_common.c | 25 +- + drivers/net/wireless/b43/phy_g.c | 8 +- + drivers/net/wireless/b43/phy_ht.c | 20 +- + drivers/net/wireless/b43/phy_lcn.c | 20 +- + drivers/net/wireless/b43/phy_lp.c | 20 +- + drivers/net/wireless/b43/phy_n.c | 128 +- + drivers/net/wireless/b43/phy_n.h | 4 + + drivers/net/wireless/b43/ppr.c | 199 ++++ + drivers/net/wireless/b43/ppr.h | 45 + + drivers/net/wireless/b43/tables_nphy.c | 128 +- + drivers/net/wireless/b43/tables_nphy.h | 2 + + drivers/net/wireless/cw1200/cw1200_spi.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 6 +- + drivers/net/wireless/mwifiex/cfg80211.c | 2 +- + drivers/net/wireless/mwifiex/cmdevt.c | 29 +- + drivers/net/wireless/mwifiex/fw.h | 9 +- + drivers/net/wireless/mwifiex/init.c | 4 +- + drivers/net/wireless/mwifiex/main.h | 2 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 2 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 10 +- + drivers/net/wireless/ray_cs.h | 5 +- + drivers/net/wireless/rayctl.h | 5 +- + drivers/net/wireless/rt2x00/rt2800.h | 4 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 6 + + drivers/net/wireless/ti/wl1251/spi.c | 1 - + drivers/net/wireless/ti/wlcore/spi.c | 20 +- + include/net/bluetooth/hci_core.h | 8 +- + include/net/bluetooth/l2cap.h | 33 +- + net/bluetooth/6lowpan.c | 10 +- + net/bluetooth/hci_core.c | 71 +- + net/bluetooth/hci_event.c | 11 +- + net/bluetooth/l2cap_core.c | 309 +++-- + net/bluetooth/l2cap_sock.c | 15 +- + net/bluetooth/mgmt.c | 124 +- + net/bluetooth/smp.c | 726 ++++++++---- + net/bluetooth/smp.h | 10 +- + net/ieee802154/6lowpan_rtnl.c | 8 - + net/mac802154/rx.c | 5 +- + net/mac802154/tx.c | 15 +- + net/mac802154/wpan.c | 10 +- + net/wireless/core.c | 7 +- + 118 files changed, 7241 insertions(+), 3971 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath10k/spectral.c + create mode 100644 drivers/net/wireless/ath/ath10k/spectral.h + create mode 100644 drivers/net/wireless/ath/spectral_common.h + create mode 100644 drivers/net/wireless/b43/ppr.c + create mode 100644 drivers/net/wireless/b43/ppr.h +Merging bluetooth/master (b804f096de0f Bluetooth: Add clarifying comment for LE CoC result value) +$ git merge bluetooth/master +Resolved 'net/bluetooth/hci_conn.c' using previous resolution. +Resolved 'net/bluetooth/hci_core.c' using previous resolution. +Resolved 'net/bluetooth/hci_event.c' using previous resolution. +Auto-merging net/bluetooth/hci_event.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_core.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_conn.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_conn.c +Auto-merging include/net/bluetooth/hci_core.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2c8c5de5c706] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + include/net/bluetooth/hci_core.h | 10 ++++--- + include/net/bluetooth/l2cap.h | 7 ++--- + net/bluetooth/hci_conn.c | 49 +++++++++++++++++---------------- + net/bluetooth/hci_core.c | 29 +++++++++++--------- + net/bluetooth/hci_event.c | 16 ++++++----- + net/bluetooth/hidp/core.c | 10 +++---- + net/bluetooth/l2cap_core.c | 59 +++++++++++++++------------------------- + net/bluetooth/l2cap_sock.c | 8 ++++++ + net/bluetooth/mgmt.c | 18 ++++++------ + net/bluetooth/smp.c | 17 +++++------- + 10 files changed, 109 insertions(+), 114 deletions(-) +Merging infiniband/for-next (d087f6ad724d Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'iwcm', 'mad', 'misc', 'mlx4', 'mlx5', 'ocrdma' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (b25046b1e5e3 mtd: nand: fix DocBook warnings on nand_sdr_timings doc) +$ git merge mtd/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1200 and retry the command. +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 4 ++++ + include/linux/mtd/nand.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) +Merging l2-mtd/master (5b49ab3e03f6 Merge l2-mtd/next into l2-mtd/master) +$ git merge l2-mtd/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1036 and retry the command. +Merge made by the 'recursive' strategy. + drivers/mtd/chips/cfi_cmdset_0002.c | 2 ++ + drivers/mtd/devices/docg3.c | 26 +++++++++++----------- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/gpio-addr-flash.c | 42 +++++++++++++++++++++++------------ + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/mtdchar.c | 3 +++ + drivers/mtd/mtdcore.c | 39 +++++++++++++++----------------- + drivers/mtd/mtdswap.c | 8 +++---- + drivers/mtd/nand/atmel_nand.c | 44 ++++++++++++++++++------------------- + drivers/mtd/nand/denali.c | 7 +++--- + drivers/mtd/nand/nand_base.c | 22 +++++++++++++++++-- + drivers/mtd/nand/nand_timings.c | 2 +- + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/ndfc.c | 3 ++- + drivers/mtd/nand/sm_common.h | 2 +- + drivers/mtd/sm_ftl.c | 2 +- + drivers/mtd/spi-nor/spi-nor.c | 9 ++------ + drivers/mtd/tests/mtd_test.c | 4 ++-- + drivers/mtd/tests/nandbiterrs.c | 2 +- + drivers/mtd/tests/oobtest.c | 8 +++---- + drivers/mtd/tests/pagetest.c | 4 ++-- + drivers/mtd/tests/readtest.c | 2 +- + drivers/mtd/tests/speedtest.c | 14 ++++++------ + drivers/mtd/tests/subpagetest.c | 10 ++++----- + include/linux/mtd/cfi.h | 22 +++++++++---------- + include/linux/mtd/nand.h | 1 + + 26 files changed, 157 insertions(+), 127 deletions(-) +Merging crypto/master (ab81873974af arm64: dts: add random number generator dts node to APM X-Gene platform.) +$ git merge crypto/master +Auto-merging crypto/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/rng/apm,rng.txt | 17 + + arch/arm64/boot/dts/apm-storm.dtsi | 21 + + arch/x86/crypto/Makefile | 1 + + arch/x86/crypto/sha-mb/Makefile | 11 + + arch/x86/crypto/sha-mb/sha1_mb.c | 935 +++++++++++++++++++++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_datastruct.S | 287 +++++++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S | 327 ++++++++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c | 64 ++ + arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S | 228 +++++ + arch/x86/crypto/sha-mb/sha1_x8_avx2.S | 472 +++++++++++ + arch/x86/crypto/sha-mb/sha_mb_ctx.h | 136 +++ + arch/x86/crypto/sha-mb/sha_mb_mgr.h | 110 +++ + crypto/Kconfig | 30 + + crypto/Makefile | 1 + + crypto/ahash.c | 12 +- + crypto/drbg.c | 130 +-- + crypto/lz4.c | 2 +- + crypto/lz4hc.c | 2 +- + crypto/mcryptd.c | 705 ++++++++++++++++ + crypto/testmgr.c | 966 +++++++++++----------- + crypto/testmgr.h | 66 ++ + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/xgene-rng.c | 423 ++++++++++ + drivers/crypto/caam/caamhash.c | 28 +- + drivers/crypto/caam/ctrl.c | 24 +- + drivers/crypto/caam/regs.h | 13 +- + drivers/crypto/caam/sg_sw_sec4.h | 54 -- + drivers/crypto/mv_cesa.h | 1 + + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 6 +- + include/crypto/drbg.h | 32 +- + include/crypto/internal/hash.h | 9 + + include/crypto/mcryptd.h | 112 +++ + include/linux/sched.h | 1 + + kernel/sched/core.c | 12 + + 36 files changed, 4588 insertions(+), 666 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/apm,rng.txt + create mode 100644 arch/x86/crypto/sha-mb/Makefile + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb.c + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_datastruct.S + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_flush_avx2.S + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_init_avx2.c + create mode 100644 arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S + create mode 100644 arch/x86/crypto/sha-mb/sha1_x8_avx2.S + create mode 100644 arch/x86/crypto/sha-mb/sha_mb_ctx.h + create mode 100644 arch/x86/crypto/sha-mb/sha_mb_mgr.h + create mode 100644 crypto/mcryptd.c + create mode 100644 drivers/char/hw_random/xgene-rng.c + create mode 100644 include/crypto/mcryptd.h +Merging drm/drm-next (47c129682950 drm/qxl: enables gem prime helpers for qxl using dummy driver callbacks) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/cik.c +Removing drivers/gpu/drm/qxl/qxl_fence.c +Auto-merging drivers/gpu/drm/drm_crtc.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 6 + + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_ttm.c | 20 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 20 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 17 +- + drivers/gpu/drm/drm_crtc.c | 331 ++--- + drivers/gpu/drm/drm_dp_mst_topology.c | 3 +- + drivers/gpu/drm/drm_edid.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 85 +- + drivers/gpu/drm/drm_fops.c | 2 + + drivers/gpu/drm/drm_irq.c | 68 + + drivers/gpu/drm/drm_modes.c | 1 + + drivers/gpu/drm/drm_modeset_lock.c | 213 +++- + drivers/gpu/drm/drm_probe_helper.c | 17 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 234 +++- + drivers/gpu/drm/i915/i915_dma.c | 21 +- + drivers/gpu/drm/i915/i915_drv.c | 153 ++- + drivers/gpu/drm/i915/i915_drv.h | 167 ++- + drivers/gpu/drm/i915/i915_gem.c | 185 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 155 +-- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 227 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 229 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 29 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 90 +- + drivers/gpu/drm/i915/i915_irq.c | 67 +- + drivers/gpu/drm/i915/i915_params.c | 6 + + drivers/gpu/drm/i915/i915_reg.h | 241 +++- + drivers/gpu/drm/i915/intel_bios.c | 13 +- + drivers/gpu/drm/i915/intel_bios.h | 3 +- + drivers/gpu/drm/i915/intel_ddi.c | 171 ++- + drivers/gpu/drm/i915/intel_display.c | 756 ++++++----- + drivers/gpu/drm/i915/intel_dp.c | 53 +- + drivers/gpu/drm/i915/intel_drv.h | 14 +- + drivers/gpu/drm/i915/intel_dsi.c | 40 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 + + drivers/gpu/drm/i915/intel_dsi_cmd.c | 2 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 38 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 17 +- + drivers/gpu/drm/i915/intel_fbdev.c | 44 +- + drivers/gpu/drm/i915/intel_hdmi.c | 8 +- + drivers/gpu/drm/i915/intel_lrc.c | 1697 +++++++++++++++++++++++++ + drivers/gpu/drm/i915/intel_lrc.h | 112 ++ + drivers/gpu/drm/i915/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/intel_pm.c | 530 +++++++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 101 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 44 +- + drivers/gpu/drm/i915/intel_sprite.c | 98 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 21 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 116 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 27 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 518 +++++--- + drivers/gpu/drm/nouveau/nouveau_fence.h | 26 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 178 ++- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 9 +- + drivers/gpu/drm/nouveau/nv04_fence.c | 6 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 6 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 22 +- + drivers/gpu/drm/qxl/Makefile | 2 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 7 - + drivers/gpu/drm/qxl/qxl_debugfs.c | 16 +- + drivers/gpu/drm/qxl/qxl_display.c | 49 + + drivers/gpu/drm/qxl/qxl_drv.c | 31 +- + drivers/gpu/drm/qxl/qxl_drv.h | 34 +- + drivers/gpu/drm/qxl/qxl_fence.c | 91 -- + drivers/gpu/drm/qxl/qxl_kms.c | 17 +- + drivers/gpu/drm/qxl/qxl_object.c | 19 +- + drivers/gpu/drm/qxl/qxl_object.h | 6 +- + drivers/gpu/drm/qxl/qxl_prime.c | 72 ++ + drivers/gpu/drm/qxl/qxl_release.c | 172 ++- + drivers/gpu/drm/qxl/qxl_ttm.c | 101 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/cik.c | 6 +- + drivers/gpu/drm/radeon/r600.c | 132 ++ + drivers/gpu/drm/radeon/r600d.h | 41 +- + drivers/gpu/drm/radeon/radeon.h | 56 +- + drivers/gpu/drm/radeon/radeon_asic.c | 25 +- + drivers/gpu/drm/radeon/radeon_asic.h | 3 + + drivers/gpu/drm/radeon/radeon_cs.c | 51 +- + drivers/gpu/drm/radeon/radeon_device.c | 61 +- + drivers/gpu/drm/radeon/radeon_display.c | 11 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_fence.c | 472 +++++-- + drivers/gpu/drm/radeon/radeon_gem.c | 119 +- + drivers/gpu/drm/radeon/radeon_ib.c | 1 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 33 +- + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_mn.c | 274 ++++ + drivers/gpu/drm/radeon/radeon_object.c | 88 +- + drivers/gpu/drm/radeon/radeon_prime.c | 10 + + drivers/gpu/drm/radeon/radeon_ttm.c | 212 ++- + drivers/gpu/drm/radeon/radeon_uvd.c | 156 ++- + drivers/gpu/drm/radeon/radeon_vm.c | 20 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 107 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 4 + + drivers/gpu/drm/ttm/ttm_bo.c | 280 ++-- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 9 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 28 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 - + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 146 +-- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 183 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 10 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 346 ++--- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 43 +- + drivers/video/fbdev/Kconfig | 4 + + drivers/video/fbdev/core/Makefile | 1 + + drivers/video/fbdev/core/fb_cmdline.c | 110 ++ + drivers/video/fbdev/core/fbmem.c | 92 -- + drivers/video/fbdev/core/modedb.c | 3 - + include/drm/drmP.h | 13 + + include/drm/drm_crtc.h | 26 +- + include/drm/drm_fb_helper.h | 1 - + include/drm/drm_modeset_lock.h | 16 + + include/drm/ttm/ttm_bo_api.h | 47 +- + include/drm/ttm/ttm_bo_driver.h | 32 +- + include/drm/ttm/ttm_execbuf_util.h | 22 +- + include/uapi/drm/radeon_drm.h | 19 + + 133 files changed, 8052 insertions(+), 3301 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_lrc.c + create mode 100644 drivers/gpu/drm/i915/intel_lrc.h + delete mode 100644 drivers/gpu/drm/qxl/qxl_fence.c + create mode 100644 drivers/gpu/drm/qxl/qxl_prime.c + create mode 100644 drivers/gpu/drm/radeon/radeon_mn.c + create mode 100644 drivers/video/fbdev/core/fb_cmdline.c +Merging drm-intel/for-linux-next (d5f0b5cb4120 drm: Remove old defines for vswing and pre-emph values) +$ git merge drm-intel/for-linux-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1201 and retry the command. +Recorded preimage for 'drivers/gpu/drm/i915/i915_irq.c' +Auto-merging drivers/gpu/drm/tegra/dpaux.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_irq.c'. +[master e9b1e036f6ea] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + drivers/gpu/drm/exynos/exynos_dp_core.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 4 +- + drivers/gpu/drm/gma500/intel_bios.c | 16 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 560 ++++++++++++++++----------- + drivers/gpu/drm/i915/i915_debugfs.c | 76 +++- + drivers/gpu/drm/i915/i915_dma.c | 7 +- + drivers/gpu/drm/i915/i915_drv.c | 38 +- + drivers/gpu/drm/i915/i915_drv.h | 56 ++- + drivers/gpu/drm/i915/i915_gem.c | 51 ++- + drivers/gpu/drm/i915/i915_gem_context.c | 65 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 82 +--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 3 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 40 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 47 +++ + drivers/gpu/drm/i915/i915_gem_tiling.c | 9 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 106 +++-- + drivers/gpu/drm/i915/i915_irq.c | 101 +++-- + drivers/gpu/drm/i915/i915_reg.h | 35 +- + drivers/gpu/drm/i915/i915_sysfs.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 16 +- + drivers/gpu/drm/i915/intel_ddi.c | 203 +++++----- + drivers/gpu/drm/i915/intel_display.c | 308 +++++++++++---- + drivers/gpu/drm/i915/intel_dp.c | 389 +++++++++++-------- + drivers/gpu/drm/i915/intel_drv.h | 11 +- + drivers/gpu/drm/i915/intel_dvo.c | 11 +- + drivers/gpu/drm/i915/intel_fbdev.c | 39 +- + drivers/gpu/drm/i915/intel_lrc.c | 78 +++- + drivers/gpu/drm/i915/intel_lrc.h | 2 + + drivers/gpu/drm/i915/intel_panel.c | 29 +- + drivers/gpu/drm/i915/intel_pm.c | 470 ++++++++++++++-------- + drivers/gpu/drm/i915/intel_renderstate.h | 8 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 153 +++++++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 2 + + drivers/gpu/drm/i915/intel_sprite.c | 11 +- + drivers/gpu/drm/radeon/atombios_dp.c | 4 +- + drivers/gpu/drm/tegra/dpaux.c | 4 +- + include/drm/drm_dp_helper.h | 16 +- + 38 files changed, 1977 insertions(+), 1081 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.h +Merging drm-tegra/drm/for-next () +$ git merge drm-tegra/drm/for-next +merge: drm-tegra/drm/for-next - not something we can merge +Merging sound/for-next (0279661b6403 ALSA: hda/realtek - move HP_GPIO_MIC1_LED quirk for alc280) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'recursive' strategy. + sound/pci/ctxfi/ctamixer.c | 4 +- + sound/pci/ctxfi/ctatc.c | 26 +- + sound/pci/ctxfi/ctdaio.c | 2 +- + sound/pci/ctxfi/cthw20k1.c | 11 +- + sound/pci/ctxfi/cthw20k2.c | 21 +- + sound/pci/ctxfi/ctmixer.c | 6 +- + sound/pci/ctxfi/ctpcm.c | 6 +- + sound/pci/ctxfi/ctresource.c | 20 +- + sound/pci/ctxfi/ctsrc.c | 4 +- + sound/pci/ctxfi/ctvmem.c | 6 +- + sound/pci/ctxfi/xfi.c | 10 +- + sound/pci/hda/hda_codec.c | 115 ---- + sound/pci/hda/hda_codec.h | 2 - + sound/pci/hda/hda_local.h | 6 - + sound/pci/hda/patch_realtek.c | 1151 ++++++++++++++++++++++------------------- + sound/pci/ice1712/ice1712.c | 2 +- + 16 files changed, 659 insertions(+), 733 deletions(-) +Merging sound-asoc/for-next (1b8e4f11c2d4 Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/wm8978' and 'asoc/topic/wm8994' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regmap/regmap.txt | 47 ++ + .../devicetree/bindings/sound/adi,axi-spdif-tx.txt | 2 +- + .../devicetree/bindings/sound/cs35l32.txt | 62 ++ + Documentation/devicetree/bindings/sound/es8328.txt | 38 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 82 +++ + .../devicetree/bindings/sound/fsl-sai.txt | 30 +- + .../devicetree/bindings/sound/imx-audio-es8328.txt | 60 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/base/regmap/regmap-i2c.c | 2 + + drivers/base/regmap/regmap-spi.c | 2 + + drivers/base/regmap/regmap.c | 74 +- + include/dt-bindings/sound/cs35l32.h | 26 + + include/sound/rt5677.h | 8 + + include/sound/soc.h | 76 ++- + sound/soc/codecs/Kconfig | 22 +- + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ab8500-codec.c | 73 +- + sound/soc/codecs/ac97.c | 15 - + sound/soc/codecs/cs35l32.c | 632 +++++++++++++++++ + sound/soc/codecs/cs35l32.h | 93 +++ + sound/soc/codecs/cs4265.c | 13 +- + sound/soc/codecs/cs42l52.c | 4 +- + sound/soc/codecs/cs42l56.c | 7 +- + sound/soc/codecs/da732x.h | 2 +- + sound/soc/codecs/es8328-i2c.c | 60 ++ + sound/soc/codecs/es8328-spi.c | 49 ++ + sound/soc/codecs/es8328.c | 757 +++++++++++++++++++++ + sound/soc/codecs/es8328.h | 314 +++++++++ + sound/soc/codecs/rt5640.c | 1 + + sound/soc/codecs/rt5677.c | 65 +- + sound/soc/codecs/rt5677.h | 10 + + sound/soc/codecs/tas2552.c | 68 +- + sound/soc/codecs/tlv320aic31xx.c | 6 +- + sound/soc/codecs/wm8994.c | 18 +- + sound/soc/davinci/edma-pcm.c | 2 + + sound/soc/fsl/Kconfig | 29 + + sound/soc/fsl/Makefile | 4 + + sound/soc/fsl/fsl-asoc-card.c | 574 ++++++++++++++++ + sound/soc/fsl/fsl_asrc.c | 6 +- + sound/soc/fsl/fsl_esai.c | 19 +- + sound/soc/fsl/fsl_esai.h | 8 +- + sound/soc/fsl/fsl_sai.c | 58 +- + sound/soc/fsl/fsl_sai.h | 8 +- + sound/soc/fsl/fsl_spdif.c | 5 +- + sound/soc/fsl/fsl_ssi.c | 33 +- + sound/soc/fsl/imx-es8328.c | 232 +++++++ + sound/soc/generic/simple-card.c | 66 +- + sound/soc/intel/Makefile | 3 +- + sound/soc/intel/sst-atom-controls.c | 39 ++ + sound/soc/intel/sst-atom-controls.h | 286 +++++++- + sound/soc/intel/sst-mfld-platform-compress.c | 38 +- + sound/soc/intel/sst-mfld-platform-pcm.c | 34 +- + sound/soc/intel/sst-mfld-platform.h | 57 +- + sound/soc/omap/omap-twl4030.c | 2 +- + sound/soc/samsung/idma.c | 4 +- + sound/soc/samsung/odroidx2_max98090.c | 4 +- + sound/soc/samsung/speyside.c | 6 +- + sound/soc/sh/fsi.c | 7 +- + sound/soc/sh/rcar/core.c | 6 +- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sh/siu_pcm.c | 4 +- + sound/soc/sirf/sirf-usp.c | 24 +- + sound/soc/soc-core.c | 671 +++++++++--------- + sound/soc/soc-generic-dmaengine-pcm.c | 4 +- + sound/soc/soc-io.c | 28 - + sound/soc/tegra/tegra_asoc_utils.h | 2 +- + sound/soc/txx9/txx9aclc.c | 14 +- + 67 files changed, 4304 insertions(+), 702 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regmap/regmap.txt + create mode 100644 Documentation/devicetree/bindings/sound/cs35l32.txt + create mode 100644 Documentation/devicetree/bindings/sound/es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + create mode 100644 include/dt-bindings/sound/cs35l32.h + create mode 100644 sound/soc/codecs/cs35l32.c + create mode 100644 sound/soc/codecs/cs35l32.h + create mode 100644 sound/soc/codecs/es8328-i2c.c + create mode 100644 sound/soc/codecs/es8328-spi.c + create mode 100644 sound/soc/codecs/es8328.c + create mode 100644 sound/soc/codecs/es8328.h + create mode 100644 sound/soc/fsl/fsl-asoc-card.c + create mode 100644 sound/soc/fsl/imx-es8328.c + create mode 100644 sound/soc/intel/sst-atom-controls.c +Merging modules/modules-next (480cadc2b7e0 scsi: Fix qemu boot hang problem) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (480cadc2b7e0 scsi: Fix qemu boot hang problem) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (6ba694560cae Input: drv260x - fix binding document) +$ git merge input/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1196 and retry the command. +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/ti,drv260x.txt | 50 ++ + drivers/input/misc/Kconfig | 11 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/drv260x.c | 741 +++++++++++++++++++++ + include/dt-bindings/input/ti-drv260x.h | 36 + + include/linux/platform_data/drv260x-pdata.h | 28 + + 6 files changed, 867 insertions(+) + create mode 100644 Documentation/devicetree/bindings/input/ti,drv260x.txt + create mode 100644 drivers/input/misc/drv260x.c + create mode 100644 include/dt-bindings/input/ti-drv260x.h + create mode 100644 include/linux/platform_data/drv260x-pdata.h +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (f37513ea97f9 Merge branch 'for-linus' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (e8531a5cbbd9 dm crypt: sort writes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 368 +++++++++++++++++++++++++------------------------- + 1 file changed, 186 insertions(+), 182 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ 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 kgdb/kgdb-next (662bfa325be1 kernel/debug/debug_core.c: Logging clean-up) +$ git merge kgdb/kgdb-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1201 and retry the command. +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 43 +++++++++++++++++++++---------------------- + 1 file changed, 21 insertions(+), 22 deletions(-) +Merging slab/for-next () +$ git merge slab/for-next +merge: slab/for-next - not something we can merge +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (90c25a429b62 md/raid5: fix init_stripe() inconsistencies) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/raid1.c | 2 +- + drivers/md/raid10.c | 10 ++++++---- + drivers/md/raid5.c | 6 ++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging mfd/master () +$ git merge mfd/master +merge: mfd/master - not something we can merge +Merging mfd-lj/for-mfd-next () +$ git merge mfd-lj/for-mfd-next +merge: mfd-lj/for-mfd-next - not something we can merge +Merging battery/master (5e37195f30cc ipaq_micro_battery: fix sparse non static symbol warning) +$ git merge battery/master +Already up-to-date. +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (58678a77029b video: fbdev: au1200fb: delete double assignment) +$ git merge omap_dss2/for-next +Auto-merging drivers/video/of_display_timing.c +Merge made by the 'recursive' strategy. + drivers/video/fbdev/aty/aty128fb.c | 63 +++++++++++++++++++++++++---- + drivers/video/fbdev/au1200fb.c | 1 - + drivers/video/fbdev/intelfb/intelfbhw.c | 3 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 52 ++++++++++++++++++++---- + drivers/video/fbdev/matrox/matroxfb_maven.c | 20 ++++----- + drivers/video/fbdev/msm/msm_fb.c | 25 +++++++++++- + drivers/video/fbdev/mx3fb.c | 2 +- + drivers/video/fbdev/omap2/dss/dsi.c | 10 ++++- + drivers/video/fbdev/riva/riva_hw.c | 1 - + drivers/video/fbdev/sis/init301.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 1 - + drivers/video/of_display_timing.c | 3 +- + 12 files changed, 146 insertions(+), 37 deletions(-) +Merging regulator/for-next (8d0ebe500af2 Merge remote-tracking branches 'regulator/topic/tps65910' and 'regulator/topic/voltage-ev' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/regulator/da9211.txt | 63 ++ + .../bindings/regulator/max1586-regulator.txt | 28 + + .../devicetree/bindings/regulator/max77802.txt | 53 ++ + .../bindings/regulator/sky81452-regulator.txt | 16 + + .../devicetree/bindings/regulator/tps65090.txt | 4 +- + Documentation/power/regulator/consumer.txt | 7 +- + Documentation/power/regulator/design.txt | 8 +- + Documentation/power/regulator/machine.txt | 4 +- + Documentation/power/regulator/overview.txt | 6 +- + Documentation/power/regulator/regulator.txt | 6 +- + MAINTAINERS | 1 + + drivers/regulator/Kconfig | 55 +- + drivers/regulator/Makefile | 5 + + drivers/regulator/core.c | 200 +++++-- + drivers/regulator/da9211-regulator.c | 176 +++++- + drivers/regulator/da9211-regulator.h | 7 +- + drivers/regulator/hi6421-regulator.c | 634 +++++++++++++++++++++ + drivers/regulator/max1586.c | 81 ++- + drivers/regulator/max77802.c | 586 +++++++++++++++++++ + drivers/regulator/mc13892-regulator.c | 11 +- + drivers/regulator/rk808-regulator.c | 408 +++++++++++++ + drivers/regulator/rn5t618-regulator.c | 143 +++++ + drivers/regulator/s2mpa01.c | 144 ++--- + drivers/regulator/s2mps11.c | 269 +++------ + drivers/regulator/sky81452-regulator.c | 130 +++++ + drivers/regulator/tps65023-regulator.c | 3 - + drivers/regulator/tps65910-regulator.c | 13 +- + include/linux/mfd/samsung/core.h | 21 + + include/linux/mfd/samsung/s2mpa01.h | 12 - + include/linux/mfd/samsung/s2mps11.h | 9 - + include/linux/mfd/samsung/s2mps14.h | 10 - + include/linux/regulator/consumer.h | 20 + + include/linux/regulator/da9211.h | 9 +- + include/linux/regulator/driver.h | 10 +- + include/linux/regulator/machine.h | 1 + + include/linux/regulator/max1586.h | 2 +- + 36 files changed, 2714 insertions(+), 441 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/da9211.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max1586-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/max77802.txt + create mode 100644 Documentation/devicetree/bindings/regulator/sky81452-regulator.txt + create mode 100644 drivers/regulator/hi6421-regulator.c + create mode 100644 drivers/regulator/max77802.c + create mode 100644 drivers/regulator/rk808-regulator.c + create mode 100644 drivers/regulator/rn5t618-regulator.c + create mode 100644 drivers/regulator/sky81452-regulator.c +Merging security/next (c3ce6dfa48e3 KEYS: Set pr_fmt() in asymmetric key signature handling) +$ git merge security/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1201 and retry the command. +Merge made by the 'recursive' strategy. + crypto/asymmetric_keys/signature.c | 1 + + include/linux/security.h | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging selinux/next (7b0d0b40cd78 selinux: Permit bounded transitions under NO_NEW_PRIVS or NOSUID.) +$ git merge selinux/next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1201 and retry the command. +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 59 ++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 47 insertions(+), 12 deletions(-) +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (8083baba5e9c wdt: sunxi: Move restart code to the watchdog driver) +$ git merge watchdog/master +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1201 and retry the command. +Merge made by the 'recursive' strategy. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging iommu/next (0fdb6739098d Merge branches 'iommu/fixes', 'arm/exynos' and 'x86/vt-d' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 51 +++++++++++++++++++------------------ + drivers/iommu/intel_irq_remapping.c | 3 +-- + 3 files changed, 28 insertions(+), 28 deletions(-) +Merging vfio/next (9b936c960f22 drivers/vfio: Enable VFIO if EEH is not supported) +$ git merge vfio/next +Already up-to-date. +Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6) +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (f9134be491de dma-debug: modify check_for_stack output) +$ git merge trivial/for-next +Auto-merging scripts/checkstack.pl +Auto-merging net/mac802154/wpan.c +Auto-merging lib/rhashtable.c +Auto-merging init/do_mounts.c +Auto-merging include/linux/pagemap.h +Auto-merging fs/btrfs/tree-log.c +Auto-merging drivers/net/ethernet/via/via-velocity.c +Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +Auto-merging drivers/i2c/busses/i2c-s3c2410.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/crypto/qat/qat_common/adf_ctl_drv.c +Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c +Auto-merging arch/powerpc/platforms/powernv/opal.c +Auto-merging Documentation/devicetree/bindings/video/atmel,lcdc.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/net/stmmac.txt +Auto-merging Documentation/devicetree/bindings/mtd/gpmc-nand.txt +Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt +Auto-merging Documentation/devicetree/bindings/clock/arm-integrator.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-net | 2 +- + Documentation/CodingStyle | 2 +- + Documentation/block/null_blk.txt | 4 ++-- + Documentation/block/queue-sysfs.txt | 6 +++--- + Documentation/devicetree/bindings/clock/arm-integrator.txt | 2 +- + Documentation/devicetree/bindings/crypto/fsl-sec6.txt | 2 +- + Documentation/devicetree/bindings/iio/adc/vf610-adc.txt | 2 +- + Documentation/devicetree/bindings/mfd/s2mps11.txt | 2 +- + Documentation/devicetree/bindings/mtd/gpmc-nand.txt | 6 +++--- + Documentation/devicetree/bindings/net/samsung-sxgbe.txt | 2 +- + Documentation/devicetree/bindings/net/stmmac.txt | 2 +- + Documentation/devicetree/bindings/pci/host-generic-pci.txt | 2 +- + Documentation/devicetree/bindings/phy/phy-bindings.txt | 2 +- + Documentation/devicetree/bindings/power_supply/charger-manager.txt | 2 +- + Documentation/devicetree/bindings/sound/st,sta350.txt | 2 +- + Documentation/devicetree/bindings/vendor-prefixes.txt | 2 +- + Documentation/devicetree/bindings/video/atmel,lcdc.txt | 4 ++-- + Documentation/devicetree/bindings/video/fsl,imx-fb.txt | 2 +- + Documentation/kmemleak.txt | 2 +- + Documentation/lockup-watchdogs.txt | 2 +- + Documentation/mips/AU1xxx_IDE.README | 2 +- + Documentation/serial/serial-rs485.txt | 2 +- + arch/blackfin/mach-common/ints-priority.c | 2 +- + arch/m68k/Kconfig.devices | 2 +- + arch/mips/lantiq/falcon/sysctrl.c | 2 +- + arch/mips/lantiq/xway/sysctrl.c | 2 +- + arch/mips/pci/pci-lantiq.c | 2 +- + arch/powerpc/boot/simpleboot.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 4 ++-- + drivers/block/paride/pcd.c | 4 ++-- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/pci/cx23885/cx23888-ir.c | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 2 +- + drivers/net/bonding/bond_sysfs_slave.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 4 ++-- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 2 +- + drivers/net/wireless/libertas/cfg.c | 2 +- + drivers/net/wireless/libertas_tf/main.c | 2 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 +- + drivers/scsi/fnic/fnic_debugfs.c | 2 +- + drivers/scsi/fnic/fnic_trace.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/qla2xxx/qla_nx2.c | 2 +- + drivers/video/backlight/88pm860x_bl.c | 2 +- + fs/btrfs/tree-log.c | 3 ++- + fs/stack.c | 2 +- + include/linux/pagemap.h | 2 +- + include/linux/percpu-refcount.h | 2 +- + init/do_mounts.c | 3 ++- + kernel/irq/devres.c | 2 +- + lib/dma-debug.c | 2 +- + lib/rhashtable.c | 4 ++-- + net/mac802154/wpan.c | 2 +- + net/netfilter/ipset/ip_set_core.c | 2 +- + net/rds/af_rds.c | 2 +- + scripts/checkstack.pl | 7 +++++-- + scripts/sign-file | 2 +- + 66 files changed, 82 insertions(+), 77 deletions(-) +Merging audit/master (451fd72219dd Merge tag 'pwm/for-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm) +$ git merge audit/master +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (a9ecdc0fdc54 of/irq: Fix lookup to use 'interrupts-extended' property first) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (99de64984c3a OF: fix of_find_node_by_path() assumption that of_allnodes is root) +$ git merge dt-rh/for-next +Already up-to-date. +Merging spi/for-next (597fc0964922 Merge remote-tracking branches 'spi/topic/sh-msiof' and 'spi/topic/xilinx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 23 +- + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 7 +- + Documentation/devicetree/bindings/spi/spi-rspi.txt | 10 +- + drivers/spi/Kconfig | 15 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-bcm53xx.c | 295 +++++++++++++++++++++ + drivers/spi/spi-bcm53xx.h | 72 +++++ + drivers/spi/spi-cadence.c | 1 - + drivers/spi/spi-dw-pci.c | 67 +++-- + drivers/spi/spi-dw.c | 12 +- + drivers/spi/spi-ep93xx.c | 1 + + drivers/spi/spi-fsl-dspi.c | 3 - + drivers/spi/spi-fsl-espi.c | 15 +- + drivers/spi/spi-fsl-spi.c | 10 +- + drivers/spi/spi-mxs.c | 4 +- + drivers/spi/spi-omap-100k.c | 4 - + drivers/spi/spi-pxa2xx-pci.c | 20 +- + drivers/spi/spi-rspi.c | 55 ++-- + drivers/spi/spi-sh-msiof.c | 51 ++-- + drivers/spi/spi-xilinx.c | 1 - + drivers/spi/spi-xtensa-xtfpga.c | 1 + + drivers/spi/spi.c | 44 +-- + 22 files changed, 589 insertions(+), 123 deletions(-) + create mode 100644 drivers/spi/spi-bcm53xx.c + create mode 100644 drivers/spi/spi-bcm53xx.h +Merging tip/auto-latest (8a6d068d3add Merge branch 'x86/uv') +$ git merge tip/auto-latest +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging drivers/gpu/drm/drm_modeset_lock.c +Auto-merging MAINTAINERS +Auto-merging Documentation/locking/spinlocks.txt +Auto-merging Documentation/locking/mutex-design.txt +Auto-merging Documentation/locking/lockstat.txt +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 2 + + Documentation/DocBook/kernel-locking.tmpl | 2 +- + Documentation/{ => locking}/lockdep-design.txt | 0 + Documentation/{ => locking}/lockstat.txt | 2 +- + Documentation/{ => locking}/mutex-design.txt | 6 +- + Documentation/{ => locking}/rt-mutex-design.txt | 0 + Documentation/{ => locking}/rt-mutex.txt | 0 + Documentation/{ => locking}/spinlocks.txt | 14 +- + Documentation/{ => locking}/ww-mutex-design.txt | 0 + MAINTAINERS | 4 +- + arch/alpha/include/asm/atomic.h | 213 +- + arch/arc/include/asm/atomic.h | 184 +- + arch/arm/include/asm/atomic.h | 305 +- + arch/arm64/include/asm/atomic.h | 197 +- + arch/avr32/include/asm/atomic.h | 123 +- + arch/cris/include/asm/atomic.h | 57 +- + arch/hexagon/include/asm/atomic.h | 68 +- + arch/ia64/include/asm/atomic.h | 188 +- + arch/m32r/include/asm/atomic.h | 143 +- + arch/m68k/include/asm/atomic.h | 109 +- + arch/metag/include/asm/atomic_lnkget.h | 121 +- + arch/metag/include/asm/atomic_lock1.h | 76 +- + arch/mips/include/asm/atomic.h | 557 ++-- + arch/mn10300/include/asm/atomic.h | 125 +- + arch/parisc/include/asm/atomic.h | 113 +- + arch/powerpc/include/asm/atomic.h | 198 +- + arch/sh/include/asm/atomic-grb.h | 119 +- + arch/sh/include/asm/atomic-irq.h | 62 +- + arch/sh/include/asm/atomic-llsc.h | 101 +- + arch/sparc/include/asm/atomic_32.h | 17 +- + arch/sparc/include/asm/atomic_64.h | 45 +- + arch/sparc/kernel/smp_64.c | 2 +- + arch/sparc/lib/atomic32.c | 29 +- + arch/sparc/lib/atomic_64.S | 163 +- + arch/sparc/lib/ksyms.c | 25 +- + arch/x86/include/asm/atomic.h | 15 - + arch/x86/include/asm/io_apic.h | 1 + + arch/x86/include/asm/microcode_intel.h | 2 +- + arch/x86/include/asm/perf_event.h | 8 + + arch/x86/include/asm/pgtable_32.h | 3 - + arch/x86/include/uapi/asm/e820.h | 5 - + arch/x86/kernel/apic/x2apic_uv_x.c | 2 - + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/microcode/amd_early.c | 2 +- + arch/x86/kernel/cpu/microcode/intel.c | 4 +- + arch/x86/kernel/cpu/microcode/intel_early.c | 10 +- + arch/x86/kernel/cpu/perf_event.c | 2 +- + arch/x86/kernel/cpu/perf_event.h | 48 +- + arch/x86/kernel/cpu/perf_event_intel.c | 53 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 183 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 3269 +------------------- + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 437 +-- + .../x86/kernel/cpu/perf_event_intel_uncore_nhmex.c | 1221 ++++++++ + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 603 ++++ + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 1645 ++++++++++ + arch/x86/kernel/kprobes/opt.c | 4 +- + arch/x86/mm/pgtable_32.c | 35 - + arch/xtensa/include/asm/atomic.h | 233 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 +- + fs/timerfd.c | 3 +- + include/asm-generic/atomic.h | 192 +- + include/asm-generic/atomic64.h | 20 +- + include/linux/atomic.h | 36 - + include/linux/bitops.h | 20 - + include/linux/jump_label.h | 17 +- + include/linux/lockdep.h | 12 +- + include/linux/mutex.h | 4 +- + include/linux/perf_event.h | 14 +- + include/linux/rwsem.h | 2 +- + include/linux/spinlock.h | 8 +- + kernel/events/core.c | 135 +- + kernel/locking/lockdep.c | 6 + + kernel/locking/mcs_spinlock.h | 3 - + kernel/locking/mutex.c | 416 +-- + kernel/locking/mutex.h | 2 +- + kernel/locking/rtmutex.c | 2 +- + kernel/sched/auto_group.c | 5 +- + kernel/sched/core.c | 155 +- + kernel/sched/cputime.c | 10 +- + kernel/sched/deadline.c | 15 +- + kernel/sched/debug.c | 6 +- + kernel/sched/fair.c | 268 +- + kernel/sched/rt.c | 16 +- + kernel/sched/sched.h | 15 +- + kernel/sched/stop_task.c | 2 +- + kernel/time/tick-sched.c | 8 + + kernel/watchdog.c | 10 +- + lib/Kconfig.debug | 4 +- + lib/atomic64.c | 83 +- + lib/locking-selftest.c | 56 +- + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-top.txt | 6 + + tools/perf/Makefile.perf | 3 + + tools/perf/arch/arm64/include/perf_regs.h | 2 + + tools/perf/arch/common.c | 9 + + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 1 + + tools/perf/builtin-annotate.c | 77 +- + tools/perf/builtin-buildid-cache.c | 44 +- + tools/perf/builtin-diff.c | 4 +- + tools/perf/builtin-help.c | 20 +- + tools/perf/builtin-inject.c | 33 +- + tools/perf/builtin-kmem.c | 56 +- + tools/perf/builtin-kvm.c | 47 +- + tools/perf/builtin-lock.c | 5 +- + tools/perf/builtin-mem.c | 4 +- + tools/perf/builtin-probe.c | 5 +- + tools/perf/builtin-record.c | 10 +- + tools/perf/builtin-report.c | 19 +- + tools/perf/builtin-sched.c | 9 +- + tools/perf/builtin-script.c | 72 +- + tools/perf/builtin-stat.c | 2 +- + tools/perf/builtin-timechart.c | 6 +- + tools/perf/builtin-top.c | 73 +- + tools/perf/builtin-trace.c | 42 +- + tools/perf/config/Makefile | 40 +- + tools/perf/config/feature-checks/Makefile | 18 +- + tools/perf/perf.c | 10 +- + tools/perf/tests/builtin-test.c | 10 +- + tools/perf/tests/mmap-basic.c | 7 +- + tools/perf/tests/open-syscall-all-cpus.c | 5 +- + tools/perf/tests/open-syscall-tp-fields.c | 7 +- + tools/perf/tests/open-syscall.c | 3 +- + tools/perf/tests/perf-record.c | 13 +- + tools/perf/tests/rdpmc.c | 6 +- + tools/perf/tests/sw-clock.c | 6 +- + tools/perf/tests/switch-tracking.c | 572 ++++ + tools/perf/tests/task-exit.c | 6 +- + tools/perf/tests/tests.h | 1 + + tools/perf/ui/browsers/hists.c | 387 +-- + tools/perf/ui/gtk/hists.c | 18 +- + tools/perf/ui/hist.c | 284 +- + tools/perf/ui/stdio/hist.c | 4 +- + tools/perf/util/annotate.c | 21 +- + tools/perf/util/cache.h | 1 + + tools/perf/util/callchain.c | 95 +- + tools/perf/util/cloexec.c | 35 +- + tools/perf/util/color.c | 16 + + tools/perf/util/color.h | 1 + + tools/perf/util/comm.c | 7 +- + tools/perf/util/comm.h | 6 +- + tools/perf/util/config.c | 24 + + tools/perf/util/data.c | 8 +- + tools/perf/util/debug.c | 36 +- + tools/perf/util/debug.h | 11 + + tools/perf/util/dso.c | 36 +- + tools/perf/util/event.c | 6 +- + tools/perf/util/event.h | 2 + + tools/perf/util/evlist.c | 131 +- + tools/perf/util/evlist.h | 5 + + tools/perf/util/evsel.c | 56 +- + tools/perf/util/evsel.h | 2 + + tools/perf/util/hist.c | 22 + + tools/perf/util/hist.h | 18 +- + tools/perf/util/machine.c | 71 +- + tools/perf/util/machine.h | 21 + + tools/perf/util/map.c | 1 + + tools/perf/util/ordered-events.c | 245 ++ + tools/perf/util/ordered-events.h | 51 + + tools/perf/util/parse-events.c | 5 +- + tools/perf/util/pmu.c | 4 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/probe-event.c | 169 +- + tools/perf/util/probe-finder.c | 7 +- + tools/perf/util/record.c | 40 +- + tools/perf/util/run-command.c | 9 +- + .../perf/util/scripting-engines/trace-event-perl.c | 6 + + .../util/scripting-engines/trace-event-python.c | 120 +- + tools/perf/util/session.c | 298 +- + tools/perf/util/session.h | 30 +- + tools/perf/util/sort.c | 82 +- + tools/perf/util/sort.h | 1 + + tools/perf/util/symbol-elf.c | 9 +- + tools/perf/util/symbol.c | 34 +- + tools/perf/util/symbol.h | 13 +- + tools/perf/util/thread.c | 24 +- + tools/perf/util/thread.h | 10 +- + tools/perf/util/tool.h | 2 +- + tools/perf/util/trace-event-scripting.c | 7 + + tools/perf/util/trace-event.h | 1 + + tools/perf/util/util.c | 54 +- + tools/perf/util/util.h | 19 + + 181 files changed, 8856 insertions(+), 7676 deletions(-) + rename Documentation/{ => locking}/lockdep-design.txt (100%) + rename Documentation/{ => locking}/lockstat.txt (99%) + rename Documentation/{ => locking}/mutex-design.txt (97%) + rename Documentation/{ => locking}/rt-mutex-design.txt (100%) + rename Documentation/{ => locking}/rt-mutex.txt (100%) + rename Documentation/{ => locking}/spinlocks.txt (98%) + rename Documentation/{ => locking}/ww-mutex-design.txt (100%) + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_nhmex.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c + create mode 100644 arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c + create mode 100644 tools/perf/tests/switch-tracking.c + create mode 100644 tools/perf/util/ordered-events.c + create mode 100644 tools/perf/util/ordered-events.h +Merging clockevents/clockevents/next (3252a646aa2c clocksource: exynos_mct: Only use 32-bits where possible) +$ git merge clockevents/clockevents/next +Already up-to-date. +Merging edac/linux_next (50d1bb93672f sb_edac: add support for Haswell based systems) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (f4ce6eca71d1 EDAC: Fix mem_types strings type) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/edac_core.h | 2 +- + drivers/edac/edac_mc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging ftrace/for-next (4ce97dbf5024 trace: Fix epoll hang when we race with new entries) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (11ed7f934cb8 rcu: Make nocb leader kthreads process pending callbacks after spawning) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + kernel/rcu/tree.h | 2 +- + kernel/rcu/tree_plugin.h | 22 +++++++++++----------- + 2 files changed, 12 insertions(+), 12 deletions(-) +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (fd2752352bbc KVM: x86: use guest maxphyaddr to check MTRR values) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 4 + + arch/arm/include/asm/kvm_host.h | 13 +- + arch/arm/kvm/arm.c | 17 +- + arch/arm64/include/asm/kvm_host.h | 12 +- + arch/ia64/include/asm/kvm_host.h | 15 +- + arch/ia64/kvm/kvm-ia64.c | 34 +- + arch/mips/include/asm/kvm_host.h | 16 +- + arch/mips/kvm/mips.c | 40 +- + arch/powerpc/include/asm/kvm_host.h | 13 +- + arch/powerpc/kvm/powerpc.c | 27 +- + arch/s390/include/asm/kvm_host.h | 19 +- + arch/s390/include/asm/pgalloc.h | 8 +- + arch/s390/include/asm/pgtable.h | 72 ++-- + arch/s390/include/asm/tlb.h | 2 +- + arch/s390/include/uapi/asm/kvm.h | 10 + + arch/s390/kvm/diag.c | 8 +- + arch/s390/kvm/interrupt.c | 145 +++----- + arch/s390/kvm/kvm-s390.c | 153 ++++---- + arch/s390/kvm/kvm-s390.h | 5 +- + arch/s390/kvm/priv.c | 11 +- + arch/s390/mm/fault.c | 25 +- + arch/s390/mm/pgtable.c | 705 +++++++++++++++++------------------- + arch/s390/mm/vmem.c | 2 +- + arch/x86/include/asm/kvm_host.h | 11 +- + arch/x86/kvm/cpuid.c | 4 +- + arch/x86/kvm/emulate.c | 42 ++- + arch/x86/kvm/lapic.c | 30 +- + arch/x86/kvm/pmu.c | 24 +- + arch/x86/kvm/svm.c | 13 +- + arch/x86/kvm/trace.h | 30 ++ + arch/x86/kvm/vmx.c | 241 ++++++++++-- + arch/x86/kvm/x86.c | 44 ++- + include/linux/kvm_host.h | 12 +- + include/linux/kvm_types.h | 14 + + include/uapi/linux/kvm.h | 6 +- + virt/kvm/kvm_main.c | 11 +- + 36 files changed, 954 insertions(+), 884 deletions(-) +Merging kvm-arm/kvm-arm-next () +$ git merge kvm-arm/kvm-arm-next +merge: kvm-arm/kvm-arm-next - not something we can merge +Merging kvm-ppc/kvm-ppc-next (c77dcacb3975 KVM: Move more code under CONFIG_HAVE_KVM_IRQFD) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (db77bfe346ab MAINTAINERS: Add xen pvscsi maintainer) +$ git merge xen-tip/linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 9 + + arch/x86/xen/p2m.c | 23 +- + arch/x86/xen/p2m.h | 15 + + arch/x86/xen/setup.c | 370 +++++-- + drivers/scsi/Kconfig | 9 + + drivers/scsi/Makefile | 1 + + drivers/scsi/xen-scsifront.c | 1024 +++++++++++++++++ + drivers/xen/Kconfig | 9 + + drivers/xen/Makefile | 1 + + drivers/xen/events/events_base.c | 5 +- + drivers/xen/grant-table.c | 2 +- + drivers/xen/xen-scsiback.c | 2124 ++++++++++++++++++++++++++++++++++++ + include/xen/events.h | 2 + + include/xen/interface/io/vscsiif.h | 229 ++++ + 14 files changed, 3726 insertions(+), 97 deletions(-) + create mode 100644 arch/x86/xen/p2m.h + create mode 100644 drivers/scsi/xen-scsifront.c + create mode 100644 drivers/xen/xen-scsiback.c + create mode 100644 include/xen/interface/io/vscsiif.h +Merging percpu/for-next (a8a26555d779 Merge branch 'for-3.18' into for-next) +$ git merge percpu/for-next +Auto-merging net/ipv6/syncookies.c +Auto-merging net/ipv4/syncookies.c +Auto-merging net/core/skbuff.c +Auto-merging net/core/dev.c +Auto-merging kernel/watchdog.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/rt.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/irq/chip.c +Auto-merging kernel/events/core.c +Auto-merging fs/ext4/mballoc.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel_ds.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel.c +Auto-merging arch/x86/kernel/cpu/perf_event.c +Auto-merging arch/tile/mm/init.c +Auto-merging arch/tile/kernel/smp.c +Auto-merging arch/s390/kernel/time.c +Auto-merging arch/mips/kernel/perf_event_mipsxx.c +Auto-merging arch/blackfin/mach-common/ints-priority.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/perf_event.c | 16 +- + arch/alpha/kernel/time.c | 6 +- + arch/arm/kernel/smp_twd.c | 12 +- + arch/avr32/kernel/kprobes.c | 2 +- + arch/blackfin/include/asm/ipipe.h | 2 +- + arch/blackfin/kernel/perf_event.c | 10 +- + arch/blackfin/mach-common/ints-priority.c | 8 +- + arch/blackfin/mach-common/smp.c | 2 +- + arch/ia64/include/asm/hw_irq.h | 2 +- + arch/ia64/include/asm/sn/arch.h | 4 +- + arch/ia64/include/asm/sn/nodepda.h | 2 +- + arch/ia64/include/asm/switch_to.h | 2 +- + arch/ia64/include/asm/uv/uv_hub.h | 2 +- + arch/ia64/kernel/irq.c | 2 +- + arch/ia64/kernel/irq_ia64.c | 4 +- + arch/ia64/kernel/kprobes.c | 6 +- + arch/ia64/kernel/mca.c | 16 +- + arch/ia64/kernel/process.c | 6 +- + arch/ia64/kernel/traps.c | 2 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 28 +- + arch/metag/kernel/perf/perf_event.c | 14 +- + arch/mips/cavium-octeon/octeon-irq.c | 30 +- + arch/mips/include/asm/fpu_emulator.h | 24 +- + arch/mips/kernel/kprobes.c | 6 +- + arch/mips/kernel/perf_event_mipsxx.c | 14 +- + arch/mips/kernel/smp-bmips.c | 2 +- + arch/mips/loongson/loongson-3/smp.c | 6 +- + arch/powerpc/include/asm/cputime.h | 6 +- + arch/s390/include/asm/cputime.h | 2 +- + arch/s390/include/asm/irq.h | 2 +- + arch/s390/include/asm/percpu.h | 16 +- + arch/s390/kernel/irq.c | 2 +- + arch/s390/kernel/kprobes.c | 8 +- + arch/s390/kernel/nmi.c | 10 +- + arch/s390/kernel/perf_cpum_cf.c | 22 +- + arch/s390/kernel/perf_cpum_sf.c | 16 +- + arch/s390/kernel/processor.c | 4 +- + arch/s390/kernel/time.c | 6 +- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/oprofile/hwsampler.c | 2 +- + arch/sparc/include/asm/cpudata_32.h | 2 +- + arch/sparc/include/asm/cpudata_64.h | 2 +- + arch/sparc/kernel/kprobes.c | 6 +- + arch/sparc/kernel/leon_smp.c | 2 +- + arch/sparc/kernel/nmi.c | 16 +- + arch/sparc/kernel/pci_sun4v.c | 8 +- + arch/sparc/kernel/perf_event.c | 26 +- + arch/sparc/kernel/sun4d_smp.c | 2 +- + arch/sparc/kernel/time_64.c | 2 +- + arch/sparc/mm/tlb.c | 4 +- + arch/tile/include/asm/irqflags.h | 4 +- + arch/tile/include/asm/mmu_context.h | 6 +- + arch/tile/kernel/irq.c | 14 +- + arch/tile/kernel/messaging.c | 4 +- + arch/tile/kernel/perf_event.c | 12 +- + arch/tile/kernel/process.c | 2 +- + arch/tile/kernel/setup.c | 3 +- + arch/tile/kernel/single_step.c | 4 +- + arch/tile/kernel/smp.c | 2 +- + arch/tile/kernel/smpboot.c | 6 +- + arch/tile/kernel/time.c | 8 +- + arch/tile/mm/highmem.c | 2 +- + arch/tile/mm/init.c | 4 +- + arch/x86/include/asm/debugreg.h | 4 +- + arch/x86/include/asm/perf_event_p4.h | 2 +- + arch/x86/include/asm/uv/uv_hub.h | 12 +- + arch/x86/kernel/apb_timer.c | 4 +- + arch/x86/kernel/apic/apic.c | 4 +- + arch/x86/kernel/apic/x2apic_cluster.c | 3 +- + arch/x86/kernel/cpu/common.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce.c | 46 +-- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 22 +- + arch/x86/kernel/cpu/perf_event.c | 22 +- + arch/x86/kernel/cpu/perf_event_amd.c | 4 +- + arch/x86/kernel/cpu/perf_event_intel.c | 18 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 20 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 12 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 12 +- + arch/x86/kernel/cpu/perf_event_knc.c | 2 +- + arch/x86/kernel/cpu/perf_event_p4.c | 6 +- + arch/x86/kernel/hw_breakpoint.c | 8 +- + arch/x86/kernel/irq_64.c | 6 +- + arch/x86/kernel/kvm.c | 22 +- + arch/x86/kvm/svm.c | 6 +- + arch/x86/kvm/vmx.c | 10 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/kmemcheck/kmemcheck.c | 14 +- + arch/x86/oprofile/nmi_int.c | 8 +- + arch/x86/oprofile/op_model_p4.c | 2 +- + arch/x86/platform/uv/uv_nmi.c | 40 +-- + arch/x86/platform/uv/uv_time.c | 2 +- + arch/x86/xen/enlighten.c | 4 +- + arch/x86/xen/multicalls.c | 8 +- + arch/x86/xen/spinlock.c | 2 +- + arch/x86/xen/time.c | 10 +- + drivers/char/random.c | 2 +- + drivers/clocksource/dummy_timer.c | 2 +- + drivers/clocksource/metag_generic.c | 2 +- + drivers/clocksource/qcom-timer.c | 2 +- + drivers/cpuidle/governors/ladder.c | 4 +- + drivers/cpuidle/governors/menu.c | 6 +- + drivers/irqchip/irq-gic.c | 10 +- + drivers/md/dm-stats.c | 2 +- + drivers/net/ethernet/tile/tilegx.c | 22 +- + drivers/net/ethernet/tile/tilepro.c | 8 +- + drivers/oprofile/cpu_buffer.c | 10 +- + drivers/oprofile/timer_int.c | 2 +- + drivers/s390/cio/ccwreq.c | 2 +- + drivers/s390/cio/chsc_sch.c | 2 +- + drivers/s390/cio/cio.c | 6 +- + drivers/s390/cio/device_fsm.c | 4 +- + drivers/s390/cio/eadm_sch.c | 2 +- + fs/ext4/mballoc.c | 2 +- + include/linux/cpumask.h | 11 + + include/linux/kernel_stat.h | 4 +- + include/linux/percpu-defs.h | 3 - + include/linux/percpu.h | 13 +- + include/net/netfilter/nf_conntrack.h | 2 +- + include/net/snmp.h | 6 +- + kernel/events/callchain.c | 4 +- + kernel/events/core.c | 24 +- + kernel/irq/chip.c | 2 +- + kernel/irq_work.c | 12 +- + kernel/printk/printk.c | 4 +- + kernel/sched/clock.c | 2 +- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 2 +- + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 4 +- + kernel/smp.c | 6 +- + kernel/softirq.c | 4 +- + kernel/taskstats.c | 2 +- + kernel/time/hrtimer.c | 22 +- + kernel/time/tick-broadcast.c | 2 +- + kernel/time/tick-common.c | 6 +- + kernel/time/tick-oneshot.c | 2 +- + kernel/time/tick-sched.c | 24 +- + kernel/time/timer.c | 2 +- + kernel/user-return-notifier.c | 4 +- + kernel/watchdog.c | 12 +- + mm/percpu-km.c | 16 +- + mm/percpu-vm.c | 184 +++------- + mm/percpu.c | 525 +++++++++++++++++++++++----- + net/core/dev.c | 14 +- + net/core/drop_monitor.c | 2 +- + net/core/skbuff.c | 2 +- + net/ipv4/route.c | 4 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/syncookies.c | 2 +- + net/rds/ib_rdma.c | 2 +- + 155 files changed, 1060 insertions(+), 792 deletions(-) +Merging workqueues/for-next (ebb48ccd98d1 Merge branch 'for-3.17' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/linux-next (770235f68ab6 platform/x86: Enable build support for toshiba_haps) +$ git merge drivers-x86/linux-next +Auto-merging drivers/platform/x86/toshiba_acpi.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/toshiba_acpi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (0a03509d8bcd Merge remote-tracking branch 'regmap/topic/dt-endian' into regmap-next) +$ git merge regmap/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/base/regmap/Kconfig | 3 +++ + drivers/base/regmap/internal.h | 3 +++ + drivers/base/regmap/regcache-rbtree.c | 9 +++------ + drivers/base/regmap/regcache.c | 2 +- + drivers/base/regmap/regmap-debugfs.c | 3 +++ + drivers/base/regmap/regmap.c | 2 +- + 7 files changed, 15 insertions(+), 8 deletions(-) +Merging hsi/for-next (3fd276e9c0d7 HSI: omap_ssi: Fix return value check in ssi_debug_add_ctrl()) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (3f6815f711ef leds: lp3944: fix sparse warning) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/led-class.c | 16 ++++++++-------- + drivers/leds/led-core.c | 2 +- + drivers/leds/leds-lp3944.c | 3 ++- + include/linux/leds.h | 6 +++--- + 4 files changed, 14 insertions(+), 13 deletions(-) +Merging driver-core/driver-core-next (69e273c0b0a3 Linux 3.17-rc3) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (69e273c0b0a3 Linux 3.17-rc3) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (69e273c0b0a3 Linux 3.17-rc3) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (8913dc0bb913 usb: gadget: document a usb_ep_dequeue() requirement) +$ git merge usb-gadget/next +Resolved 'drivers/usb/phy/phy-samsung-usb.h' using previous resolution. +Auto-merging drivers/usb/phy/phy-samsung-usb.h +CONFLICT (content): Merge conflict in drivers/usb/phy/phy-samsung-usb.h +Auto-merging drivers/usb/phy/phy-msm-usb.c +Auto-merging drivers/usb/gadget/udc/r8a66597-udc.c +Auto-merging drivers/usb/gadget/function/uvc_video.c +Auto-merging drivers/usb/gadget/function/Makefile +Auto-merging drivers/usb/dwc3/dwc3-omap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4ed882efbd6e] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 12 + + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 12 + + drivers/usb/dwc3/core.c | 9 +- + drivers/usb/dwc3/dwc3-exynos.c | 4 +- + drivers/usb/dwc3/dwc3-omap.c | 4 +- + drivers/usb/dwc3/dwc3-pci.c | 4 +- + drivers/usb/dwc3/gadget.c | 11 +- + drivers/usb/gadget/Kconfig | 6 + + drivers/usb/gadget/function/Makefile | 4 + + drivers/usb/gadget/function/f_uac1.c | 337 +++++++++++++++---- + drivers/usb/gadget/function/f_uac2.c | 359 ++++++++++++++------- + drivers/usb/gadget/function/f_uvc.c | 5 +- + drivers/usb/gadget/function/u_uac1.c | 38 +-- + drivers/usb/gadget/function/u_uac1.h | 31 +- + drivers/usb/gadget/function/u_uac2.h | 42 +++ + drivers/usb/gadget/function/uvc.h | 3 - + drivers/usb/gadget/function/uvc_queue.c | 2 +- + drivers/usb/gadget/function/uvc_v4l2.c | 2 +- + drivers/usb/gadget/function/uvc_video.c | 2 +- + drivers/usb/gadget/legacy/Kconfig | 2 + + drivers/usb/gadget/legacy/audio.c | 149 ++++++++- + drivers/usb/gadget/udc/r8a66597-udc.c | 4 +- + drivers/usb/phy/phy-msm-usb.c | 2 +- + drivers/usb/phy/phy-samsung-usb.h | 36 +-- + include/linux/usb/gadget.h | 9 +- + 25 files changed, 808 insertions(+), 281 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uac1 + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uac2 + create mode 100644 drivers/usb/gadget/function/u_uac2.h +Merging staging/staging-next (220f115e5edd staging: android: use braces on all arms of if) +$ git merge staging/staging-next +Removing drivers/staging/unisys/include/commontypes.h +Removing drivers/staging/rtl8188eu/include/rtl8188e_rf.h +Removing drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h +Removing drivers/staging/rtl8188eu/include/HalPwrSeqCmd.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h +Removing drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h +Removing drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h +Removing drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c +Removing drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c +Auto-merging drivers/staging/rtl8188eu/hal/pwrseqcmd.c +Auto-merging drivers/staging/rtl8188eu/hal/pwrseq.c +Removing drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c +Auto-merging drivers/staging/rtl8188eu/hal/bb_cfg.c +Removing drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c +Removing drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c +Removing drivers/staging/nokia_h4p/nokia_uart.c +Removing drivers/staging/nokia_h4p/nokia_fw.c +Removing drivers/staging/nokia_h4p/nokia_fw-ti1273.c +Removing drivers/staging/nokia_h4p/nokia_fw-csr.c +Removing drivers/staging/nokia_h4p/nokia_fw-bcm.c +Removing drivers/staging/nokia_h4p/nokia_core.c +Removing drivers/staging/nokia_h4p/hci_h4p.h +Removing drivers/staging/nokia_h4p/TODO +Removing drivers/staging/nokia_h4p/Makefile +Removing drivers/staging/nokia_h4p/Kconfig +Removing drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c +Removing drivers/staging/lustre/lustre/obdecho/echo.c +Removing drivers/staging/lustre/lustre/obdclass/mea.c +Removing drivers/staging/lustre/lustre/obdclass/md_attrs.c +Removing drivers/staging/lustre/lustre/obdclass/lu_ucred.c +Removing drivers/staging/lustre/lustre/obdclass/llog_test.c +Removing drivers/staging/lustre/lustre/obdclass/llog_osd.c +Removing drivers/staging/lustre/lustre/obdclass/llog_lvfs.c +Removing drivers/staging/lustre/lustre/obdclass/linkea.c +Removing drivers/staging/lustre/lustre/obdclass/idmap.c +Removing drivers/staging/lustre/lustre/mgc/libmgc.c +Removing drivers/staging/lustre/lustre/libcfs/heap.c +Removing drivers/staging/lustre/lustre/include/md_object.h +Removing drivers/staging/lustre/lustre/include/lustre_linkea.h +Removing drivers/staging/lustre/lustre/include/lustre_idmap.h +Removing drivers/staging/lustre/lustre/include/linux/obd_support.h +Removing drivers/staging/lustre/lustre/include/linux/obd_class.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_quota.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_net.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_log.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_lib.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_handles.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_dlm.h +Removing drivers/staging/lustre/lustre/include/linux/lustre_acl.h +Removing drivers/staging/lustre/lustre/include/linux/lprocfs_status.h +Removing drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h +Removing drivers/staging/iio/frequency/ad9951.c +Removing drivers/staging/iio/frequency/ad9910.c +Removing drivers/staging/iio/frequency/ad9852.c +Removing drivers/staging/iio/frequency/ad9850.c +Removing drivers/staging/iio/frequency/ad5930.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-iio-accel-bmc150 | 7 + + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 18 +- + .../devicetree/bindings/iio/dac/max5821.txt | 14 + + MAINTAINERS | 28 + + drivers/iio/accel/Kconfig | 13 + + drivers/iio/accel/Makefile | 1 + + drivers/iio/accel/bmc150-accel.c | 1307 +++++++++++ + drivers/iio/accel/kxcjk-1013.c | 294 ++- + drivers/iio/adc/Kconfig | 22 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/exynos_adc.c | 137 +- + drivers/iio/adc/rockchip_saradc.c | 317 +++ + drivers/iio/adc/ti-adc128s052.c | 179 ++ + drivers/iio/adc/xilinx-xadc-core.c | 9 +- + drivers/iio/dac/Kconfig | 8 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/max5821.c | 405 ++++ + drivers/iio/industrialio-buffer.c | 63 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 7 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/ion/ion.c | 2 +- + drivers/staging/android/ion/ion_carveout_heap.c | 1 - + drivers/staging/android/ion/ion_chunk_heap.c | 1 - + drivers/staging/android/ion/ion_dummy_driver.c | 4 +- + drivers/staging/android/ion/ion_system_heap.c | 1 - + drivers/staging/android/sw_sync.c | 2 + + drivers/staging/android/sync.c | 5 +- + drivers/staging/android/uapi/binder.h | 2 +- + drivers/staging/bcm/Bcmchar.c | 2427 ++++++++++---------- + drivers/staging/bcm/Bcmnet.c | 101 +- + drivers/staging/bcm/InterfaceMisc.h | 2 +- + drivers/staging/bcm/LeakyBucket.c | 81 +- + drivers/staging/bcm/vendorspecificextn.c | 19 +- + drivers/staging/comedi/Kconfig | 36 +- + drivers/staging/comedi/comedi_pci.c | 24 + + drivers/staging/comedi/comedidev.h | 11 + + drivers/staging/comedi/drivers.c | 42 + + drivers/staging/comedi/drivers/8255.c | 198 +- + drivers/staging/comedi/drivers/8255.h | 31 +- + drivers/staging/comedi/drivers/8255_pci.c | 38 +- + drivers/staging/comedi/drivers/Makefile | 4 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 12 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 - + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 349 ++- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 181 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1032.c | 12 +- + drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_1564.c | 133 +- + drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_2032.c | 9 +- + drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +- + drivers/staging/comedi/drivers/addi_apci_3120.c | 8 +- + drivers/staging/comedi/drivers/addi_apci_3501.c | 23 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 25 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 40 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 2 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9111.c | 32 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 8 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 4 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 2 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 17 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 50 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 121 +- + drivers/staging/comedi/drivers/amplc_dio200.h | 34 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 414 ++-- + drivers/staging/comedi/drivers/amplc_dio200_pci.c | 167 +- + .../staging/comedi/drivers/amplc_pc236_common.c | 10 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 726 +++--- + drivers/staging/comedi/drivers/amplc_pci230.c | 1179 ++++------ + drivers/staging/comedi/drivers/amplc_pci236.c | 9 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 44 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 52 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 139 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 29 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 78 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 62 +- + drivers/staging/comedi/drivers/comedi_parport.c | 8 +- + drivers/staging/comedi/drivers/comedi_test.c | 8 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 2 +- + drivers/staging/comedi/drivers/dac02.c | 33 +- + drivers/staging/comedi/drivers/daqboard2000.c | 76 +- + drivers/staging/comedi/drivers/das08.c | 71 +- + drivers/staging/comedi/drivers/das08.h | 1 - + drivers/staging/comedi/drivers/das08_pci.c | 2 +- + drivers/staging/comedi/drivers/das16.c | 14 +- + drivers/staging/comedi/drivers/das16m1.c | 2 +- + drivers/staging/comedi/drivers/das6402.c | 14 +- + drivers/staging/comedi/drivers/dmm32at.c | 69 +- + drivers/staging/comedi/drivers/dt2801.c | 36 +- + drivers/staging/comedi/drivers/dt2811.c | 46 +- + drivers/staging/comedi/drivers/dt282x.c | 31 +- + drivers/staging/comedi/drivers/dt3000.c | 60 +- + drivers/staging/comedi/drivers/dt9812.c | 27 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 2 +- + drivers/staging/comedi/drivers/fl512.c | 35 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 51 +- + drivers/staging/comedi/drivers/icp_multi.c | 67 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 39 +- + drivers/staging/comedi/drivers/jr3_pci.c | 2 +- + drivers/staging/comedi/drivers/ke_counter.c | 2 +- + drivers/staging/comedi/drivers/me4000.c | 71 +- + drivers/staging/comedi/drivers/me_daq.c | 36 +- + drivers/staging/comedi/drivers/mf6x4.c | 46 +- + drivers/staging/comedi/drivers/multiq3.c | 46 +- + drivers/staging/comedi/drivers/ni_6527.c | 11 +- + drivers/staging/comedi/drivers/ni_65xx.c | 13 +- + drivers/staging/comedi/drivers/ni_670x.c | 66 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 35 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 63 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc.c | 1378 +---------- + drivers/staging/comedi/drivers/ni_labpc_common.c | 1387 +++++++++++ + drivers/staging/comedi/drivers/ni_labpc_pci.c | 11 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 48 +- + drivers/staging/comedi/drivers/ni_stc.h | 1 - + drivers/staging/comedi/drivers/ni_tiocmd.c | 5 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 425 ++++ + drivers/staging/comedi/drivers/pcl711.c | 27 +- + drivers/staging/comedi/drivers/pcl724.c | 10 +- + drivers/staging/comedi/drivers/pcl726.c | 37 +- + drivers/staging/comedi/drivers/pcl812.c | 36 +- + drivers/staging/comedi/drivers/pcl818.c | 33 +- + drivers/staging/comedi/drivers/pcm3724.c | 27 +- + drivers/staging/comedi/drivers/pcmda12.c | 16 +- + drivers/staging/comedi/drivers/pcmmio.c | 29 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 11 +- + drivers/staging/comedi/drivers/rtd520.c | 26 +- + drivers/staging/comedi/drivers/rti800.c | 32 +- + drivers/staging/comedi/drivers/rti802.c | 29 +- + drivers/staging/comedi/drivers/s526.c | 43 +- + drivers/staging/comedi/drivers/s626.c | 93 +- + drivers/staging/comedi/drivers/skel.c | 68 +- + drivers/staging/comedi/drivers/usbdux.c | 37 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 38 +- + drivers/staging/dgap/dgap.c | 572 ++--- + drivers/staging/dgap/dgap.h | 7 - + drivers/staging/dgnc/Makefile | 3 +- + drivers/staging/dgnc/TODO | 7 - + drivers/staging/dgnc/dgnc_cls.c | 75 +- + drivers/staging/dgnc/dgnc_driver.c | 333 +-- + drivers/staging/dgnc/dgnc_driver.h | 41 +- + drivers/staging/dgnc/dgnc_mgmt.c | 23 - + drivers/staging/dgnc/dgnc_neo.c | 137 +- + drivers/staging/dgnc/dgnc_sysfs.c | 19 - + drivers/staging/dgnc/dgnc_tty.c | 277 +-- + drivers/staging/dgnc/dgnc_utils.c | 70 + + drivers/staging/dgnc/dgnc_utils.h | 7 + + drivers/staging/emxx_udc/emxx_udc.c | 8 +- + drivers/staging/et131x/README | 1 - + drivers/staging/et131x/et131x.c | 262 +-- + drivers/staging/et131x/et131x.h | 96 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 9 +- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 2 +- + drivers/staging/iio/accel/adis16201_core.c | 5 +- + drivers/staging/iio/accel/adis16203_core.c | 2 + + drivers/staging/iio/accel/adis16204_core.c | 1 + + drivers/staging/iio/accel/adis16209_core.c | 1 + + drivers/staging/iio/accel/adis16240_core.c | 1 + + drivers/staging/iio/accel/lis3l02dq_core.c | 4 + + drivers/staging/iio/accel/lis3l02dq_ring.c | 1 + + drivers/staging/iio/accel/sca3000_core.c | 4 +- + drivers/staging/iio/frequency/Kconfig | 35 - + drivers/staging/iio/frequency/Makefile | 5 - + drivers/staging/iio/frequency/ad5930.c | 140 -- + drivers/staging/iio/frequency/ad9850.c | 120 - + drivers/staging/iio/frequency/ad9852.c | 253 -- + drivers/staging/iio/frequency/ad9910.c | 371 --- + drivers/staging/iio/frequency/ad9951.c | 209 -- + drivers/staging/iio/gyro/adis16060_core.c | 1 + + drivers/staging/iio/impedance-analyzer/ad5933.c | 10 +- + drivers/staging/iio/light/isl29018.c | 2 +- + drivers/staging/iio/magnetometer/hmc5843_core.c | 6 +- + drivers/staging/iio/resolver/ad2s1210.c | 4 +- + drivers/staging/imx-drm/imx-drm-core.c | 5 +- + drivers/staging/imx-drm/imx-tve.c | 2 + + drivers/staging/imx-drm/ipuv3-crtc.c | 9 +- + drivers/staging/imx-drm/parallel-display.c | 2 + + drivers/staging/lustre/README.txt | 87 + + .../staging/lustre/include/linux/libcfs/libcfs.h | 1 - + .../lustre/include/linux/libcfs/libcfs_heap.h | 200 -- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 8 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 39 +- + .../lustre/lnet/klnds/socklnd/socklnd_modparams.c | 10 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 15 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 7 +- + drivers/staging/lustre/lnet/lnet/config.c | 59 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 12 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 35 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 2 +- + drivers/staging/lustre/lnet/selftest/console.c | 2 +- + drivers/staging/lustre/lnet/selftest/framework.c | 5 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 24 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 1 - + drivers/staging/lustre/lustre/fld/fld_cache.c | 17 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 2 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 24 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 - + drivers/staging/lustre/lustre/include/cl_object.h | 4 +- + .../staging/lustre/lustre/include/interval_tree.h | 2 +- + drivers/staging/lustre/lustre/include/lclient.h | 16 +- + .../lustre/lustre/include/linux/lprocfs_status.h | 57 - + .../lustre/lustre/include/linux/lustre_acl.h | 66 - + .../lustre/lustre/include/linux/lustre_compat25.h | 18 +- + .../lustre/lustre/include/linux/lustre_dlm.h | 46 - + .../lustre/lustre/include/linux/lustre_fsfilt.h | 5 +- + .../lustre/lustre/include/linux/lustre_handles.h | 52 - + .../lustre/lustre/include/linux/lustre_lib.h | 85 - + .../lustre/lustre/include/linux/lustre_log.h | 57 - + .../lustre/lustre/include/linux/lustre_net.h | 49 - + .../lustre/lustre/include/linux/lustre_quota.h | 46 - + drivers/staging/lustre/lustre/include/linux/lvfs.h | 2 +- + drivers/staging/lustre/lustre/include/linux/obd.h | 2 +- + .../lustre/lustre/include/linux/obd_class.h | 58 - + .../lustre/lustre/include/linux/obd_support.h | 63 - + .../staging/lustre/lustre/include/lprocfs_status.h | 13 +- + drivers/staging/lustre/lustre/include/lu_object.h | 10 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 174 +- + .../lustre/lustre/include/lustre/lustre_user.h | 32 +- + drivers/staging/lustre/lustre/include/lustre_acl.h | 9 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 +- + .../staging/lustre/lustre/include/lustre_disk.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 4 +- + .../staging/lustre/lustre/include/lustre_export.h | 4 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 5 +- + .../staging/lustre/lustre/include/lustre_handles.h | 10 +- + .../staging/lustre/lustre/include/lustre_idmap.h | 104 - + .../lustre/include/{linux => }/lustre_intent.h | 0 + drivers/staging/lustre/lustre/include/lustre_lib.h | 26 +- + .../staging/lustre/lustre/include/lustre_linkea.h | 57 - + .../staging/lustre/lustre/include/lustre_lite.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 16 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 289 +-- + .../staging/lustre/lustre/include/lustre_quota.h | 4 +- + drivers/staging/lustre/lustre/include/lustre_sec.h | 4 +- + drivers/staging/lustre/lustre/include/lustre_ver.h | 4 +- + drivers/staging/lustre/lustre/include/md_object.h | 903 -------- + drivers/staging/lustre/lustre/include/obd.h | 60 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +- + drivers/staging/lustre/lustre/include/obd_class.h | 62 +- + drivers/staging/lustre/lustre/include/obd_ost.h | 2 +- + .../staging/lustre/lustre/include/obd_support.h | 17 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 57 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 108 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 34 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 16 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 112 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 21 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 17 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 21 +- + drivers/staging/lustre/lustre/libcfs/heap.c | 475 ---- + .../lustre/lustre/libcfs/linux/linux-debug.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-module.c | 10 +- + .../lustre/lustre/libcfs/linux/linux-tcpip.c | 10 +- + drivers/staging/lustre/lustre/libcfs/module.c | 10 +- + .../staging/lustre/lustre/libcfs/upcall_cache.c | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 181 +- + drivers/staging/lustre/lustre/llite/file.c | 329 ++- + drivers/staging/lustre/lustre/llite/llite_capa.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 10 +- + .../staging/lustre/lustre/llite/llite_internal.h | 22 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 132 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 26 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 12 +- + drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 2 +- + drivers/staging/lustre/lustre/llite/lloop.c | 50 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 59 +- + drivers/staging/lustre/lustre/llite/namei.c | 56 +- + drivers/staging/lustre/lustre/llite/remote_perm.c | 8 +- + drivers/staging/lustre/lustre/llite/rw.c | 22 +- + drivers/staging/lustre/lustre/llite/rw26.c | 4 +- + drivers/staging/lustre/lustre/llite/statahead.c | 71 +- + drivers/staging/lustre/lustre/llite/super25.c | 3 +- + drivers/staging/lustre/lustre/llite/symlink.c | 11 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 4 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 19 +- + drivers/staging/lustre/lustre/llite/xattr.c | 53 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 22 +- + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 16 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 10 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 109 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 30 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 24 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 14 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 44 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 29 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 6 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 21 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 2 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 10 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 48 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 77 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 12 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 419 ++-- + drivers/staging/lustre/lustre/mgc/libmgc.c | 158 -- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 273 +-- + drivers/staging/lustre/lustre/obdclass/Makefile | 9 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 11 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 4 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 3 +- + drivers/staging/lustre/lustre/obdclass/idmap.c | 477 ---- + drivers/staging/lustre/lustre/obdclass/linkea.c | 194 -- + .../lustre/lustre/obdclass/linux/linux-obdo.c | 8 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 3 +- + drivers/staging/lustre/lustre/obdclass/llog_lvfs.c | 847 ------- + drivers/staging/lustre/lustre/obdclass/llog_osd.c | 1290 ----------- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 52 +- + drivers/staging/lustre/lustre/obdclass/llog_test.c | 1072 --------- + .../staging/lustre/lustre/obdclass/local_storage.c | 2 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 27 +- + drivers/staging/lustre/lustre/obdclass/lu_ucred.c | 107 - + .../lustre/lustre/obdclass/lustre_handles.c | 2 +- + drivers/staging/lustre/lustre/obdclass/md_attrs.c | 199 -- + drivers/staging/lustre/lustre/obdclass/mea.c | 112 - + .../staging/lustre/lustre/obdclass/obd_config.c | 6 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 12 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 14 +- + .../staging/lustre/lustre/obdclass/statfs_pack.c | 2 +- + drivers/staging/lustre/lustre/obdecho/echo.c | 671 ------ + .../staging/lustre/lustre/obdecho/echo_client.c | 1185 +--------- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 2 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 8 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 5 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 78 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 28 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 16 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c | 40 - + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 2 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 3 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 48 - + drivers/staging/mt29f_spinand/mt29f_spinand.c | 26 +- + drivers/staging/netlogic/TODO | 1 - + drivers/staging/netlogic/platform_net.c | 212 +- + drivers/staging/netlogic/platform_net.h | 7 +- + drivers/staging/netlogic/xlr_net.c | 302 +-- + drivers/staging/netlogic/xlr_net.h | 8 +- + drivers/staging/nokia_h4p/Kconfig | 9 - + drivers/staging/nokia_h4p/Makefile | 6 - + drivers/staging/nokia_h4p/TODO | 132 -- + drivers/staging/nokia_h4p/hci_h4p.h | 222 -- + drivers/staging/nokia_h4p/nokia_core.c | 1207 ---------- + drivers/staging/nokia_h4p/nokia_fw-bcm.c | 149 -- + drivers/staging/nokia_h4p/nokia_fw-csr.c | 149 -- + drivers/staging/nokia_h4p/nokia_fw-ti1273.c | 110 - + drivers/staging/nokia_h4p/nokia_fw.c | 208 -- + drivers/staging/nokia_h4p/nokia_uart.c | 199 -- + drivers/staging/octeon-usb/octeon-hcd.c | 50 +- + drivers/staging/ozwpan/ozcdev.c | 31 +- + drivers/staging/ozwpan/ozeltbuf.c | 129 +- + drivers/staging/ozwpan/ozeltbuf.h | 7 +- + drivers/staging/ozwpan/ozhcd.c | 166 +- + drivers/staging/ozwpan/ozmain.c | 4 +- + drivers/staging/ozwpan/ozpd.c | 305 +-- + drivers/staging/ozwpan/ozpd.h | 9 +- + drivers/staging/ozwpan/ozproto.c | 36 +- + drivers/staging/ozwpan/ozproto.h | 8 +- + drivers/staging/ozwpan/ozprotocol.h | 2 - + drivers/staging/ozwpan/ozusbsvc.c | 30 +- + drivers/staging/ozwpan/ozusbsvc1.c | 12 +- + drivers/staging/rtl8188eu/Makefile | 16 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_iol.c | 164 -- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c | 231 -- + drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c | 269 --- + drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 289 +-- + .../rtl8188eu/hal/{HalHWImg8188E_BB.c => bb_cfg.c} | 474 ++-- + drivers/staging/rtl8188eu/hal/fw.c | 236 ++ + drivers/staging/rtl8188eu/hal/hal_intf.c | 26 - + drivers/staging/rtl8188eu/hal/mac_cfg.c | 134 ++ + drivers/staging/rtl8188eu/hal/odm.c | 67 +- + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 36 - + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 153 +- + drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c | 138 -- + drivers/staging/rtl8188eu/hal/phy.c | 382 +++ + .../rtl8188eu/hal/{Hal8188EPwrSeq.c => pwrseq.c} | 48 +- + .../rtl8188eu/hal/{HalPwrSeqCmd.c => pwrseqcmd.c} | 66 +- + drivers/staging/rtl8188eu/hal/rf.c | 316 +++ + drivers/staging/rtl8188eu/hal/rf_cfg.c | 320 +++ + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 401 +--- + drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 936 -------- + drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 527 ----- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 25 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 65 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 37 - + drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h | 176 -- + .../staging/rtl8188eu/include/HalHWImg8188E_BB.h | 44 - + .../staging/rtl8188eu/include/HalHWImg8188E_MAC.h | 30 - + .../staging/rtl8188eu/include/HalHWImg8188E_RF.h | 30 - + drivers/staging/rtl8188eu/include/HalPwrSeqCmd.h | 128 -- + drivers/staging/rtl8188eu/include/drv_types.h | 7 - + drivers/staging/rtl8188eu/include/fw.h | 59 + + drivers/staging/rtl8188eu/include/hal_intf.h | 15 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 6 - + .../staging/rtl8188eu/include/odm_RegConfig8188E.h | 43 - + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/phy.h | 16 + + drivers/staging/rtl8188eu/include/pwrseq.h | 341 +++ + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 90 + + drivers/staging/rtl8188eu/include/rf.h | 11 + + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 52 +- + drivers/staging/rtl8188eu/include/rtl8188e_rf.h | 36 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 1 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 54 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 7 +- + drivers/staging/rtl8192e/dot11d.c | 1 + + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 1 + + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 + + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 1 + + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 8 + + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 + + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 15 + + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 15 + + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 + + drivers/staging/rtl8192e/rtl819x_BAProc.c | 5 + + drivers/staging/rtl8192e/rtl819x_HTProc.c | 7 + + drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 + + drivers/staging/rtl8192e/rtllib.h | 1 + + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 3 + + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 5 + + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 4 + + drivers/staging/rtl8192e/rtllib_module.c | 1 + + drivers/staging/rtl8192e/rtllib_rx.c | 10 + + drivers/staging/rtl8192e/rtllib_softmac.c | 23 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 1 + + drivers/staging/rtl8192e/rtllib_tx.c | 4 + + drivers/staging/rtl8192e/rtllib_wx.c | 5 + + drivers/staging/rtl8192ee/base.c | 76 +- + drivers/staging/rtl8192ee/btcoexist/rtl_btc.c | 9 +- + drivers/staging/rtl8192ee/cam.c | 75 +- + drivers/staging/rtl8192ee/core.c | 154 +- + drivers/staging/rtl8192ee/debug.c | 88 +- + drivers/staging/rtl8192ee/debug.h | 20 +- + drivers/staging/rtl8192ee/efuse.c | 29 +- + drivers/staging/rtl8192ee/pci.c | 223 +- + drivers/staging/rtl8192ee/ps.c | 61 +- + drivers/staging/rtl8192ee/rc.c | 2 +- + drivers/staging/rtl8192ee/regd.c | 12 +- + drivers/staging/rtl8192ee/rtl8192ee/dm.c | 46 +- + drivers/staging/rtl8192ee/rtl8192ee/fw.c | 128 +- + drivers/staging/rtl8192ee/rtl8192ee/hw.c | 180 +- + drivers/staging/rtl8192ee/rtl8192ee/led.c | 16 +- + drivers/staging/rtl8192ee/rtl8192ee/phy.c | 279 ++- + drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c | 31 +- + drivers/staging/rtl8192ee/rtl8192ee/rf.c | 10 +- + drivers/staging/rtl8192ee/rtl8192ee/sw.c | 9 +- + drivers/staging/rtl8192ee/rtl8192ee/trx.c | 26 +- + drivers/staging/rtl8192u/Makefile | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 8 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 20 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 92 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 8 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 12 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 1014 +++----- + drivers/staging/rtl8192u/r8192U_dm.c | 24 +- + drivers/staging/rtl8192u/r8192U_wx.c | 3 +- + drivers/staging/rtl8192u/r819xU_firmware.c | 6 +- + drivers/staging/rtl8192u/r819xU_phyreg.h | 189 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 2 +- + drivers/staging/rtl8723au/core/rtw_cmd.c | 4 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 36 +- + drivers/staging/rtl8723au/core/rtw_ieee80211.c | 4 +- + drivers/staging/rtl8723au/core/rtw_mlme.c | 22 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 22 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 4 +- + drivers/staging/rtl8723au/include/ieee80211.h | 2 +- + drivers/staging/rtl8723au/include/osdep_service.h | 4 +- + drivers/staging/rtl8723au/include/rtl8723a_rf.h | 4 +- + drivers/staging/rtl8723au/include/rtl8723a_spec.h | 6 +- + drivers/staging/rtl8723au/include/rtw_efuse.h | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 6 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 2 +- + .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.c | 2 +- + drivers/staging/rtl8821ae/pci.c | 6 +- + drivers/staging/rtl8821ae/rtl8821ae/phy.c | 18 +- + drivers/staging/rtl8821ae/rtl8821ae/rf.c | 2 +- + drivers/staging/rtl8821ae/stats.c | 5 +- + drivers/staging/rts5208/Kconfig | 7 - + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/rtsx.c | 8 +- + drivers/staging/rts5208/rtsx_chip.c | 6 +- + drivers/staging/rts5208/rtsx_scsi.c | 7 +- + drivers/staging/rts5208/sd.c | 11 +- + drivers/staging/rts5208/trace.h | 8 - + drivers/staging/slicoss/slicoss.c | 2 + + drivers/staging/unisys/channels/channel.c | 12 +- + .../unisys/common-spar/include/channels/channel.h | 43 +- + .../include/channels/controlframework.h | 2 +- + .../include/channels/controlvmchannel.h | 4 +- + .../common-spar/include/channels/diagchannel.h | 2 +- + .../common-spar/include/channels/iochannel.h | 43 +- + .../common-spar/include/channels/vbuschannel.h | 1 - + .../include/controlvmcompletionstatus.h | 16 +- + .../unisys/common-spar/include/iovmcall_gnuc.h | 30 +- + .../unisys/common-spar/include/vbusdeviceinfo.h | 3 +- + drivers/staging/unisys/include/commontypes.h | 72 - + drivers/staging/unisys/include/timskmod.h | 54 +- + drivers/staging/unisys/include/uisqueue.h | 15 - + drivers/staging/unisys/include/uisutils.h | 2 + + drivers/staging/unisys/uislib/uislib.c | 113 +- + drivers/staging/unisys/uislib/uisqueue.c | 6 +- + drivers/staging/unisys/uislib/uisthread.c | 1 + + drivers/staging/unisys/uislib/uisutils.c | 56 +- + drivers/staging/unisys/virthba/virthba.c | 8 +- + drivers/staging/unisys/virtpci/virtpci.c | 4 +- + drivers/staging/unisys/visorchannel/visorchannel.h | 1 - + .../unisys/visorchannel/visorchannel_funcs.c | 4 +- + drivers/staging/unisys/visorchipset/file.c | 1 + + drivers/staging/unisys/visorchipset/parser.c | 2 + + .../unisys/visorchipset/visorchipset_main.c | 58 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 14 +- + drivers/staging/vt6655/80211mgr.c | 41 +- + drivers/staging/vt6655/80211mgr.h | 15 +- + drivers/staging/vt6655/baseband.c | 310 ++- + drivers/staging/vt6655/baseband.h | 27 +- + drivers/staging/vt6655/bssdb.c | 99 +- + drivers/staging/vt6655/bssdb.h | 8 +- + drivers/staging/vt6655/card.c | 454 ++-- + drivers/staging/vt6655/card.h | 99 +- + drivers/staging/vt6655/channel.c | 17 +- + drivers/staging/vt6655/datarate.c | 15 +- + drivers/staging/vt6655/desc.h | 219 +- + drivers/staging/vt6655/device.h | 39 +- + drivers/staging/vt6655/device_cfg.h | 3 - + drivers/staging/vt6655/device_main.c | 509 ++-- + drivers/staging/vt6655/dpc.c | 170 +- + drivers/staging/vt6655/dpc.h | 2 +- + drivers/staging/vt6655/hostap.c | 146 +- + drivers/staging/vt6655/hostap.h | 4 +- + drivers/staging/vt6655/ioctl.c | 84 +- + drivers/staging/vt6655/ioctl.h | 2 +- + drivers/staging/vt6655/iowpa.h | 4 +- + drivers/staging/vt6655/iwctl.c | 164 +- + drivers/staging/vt6655/key.c | 144 +- + drivers/staging/vt6655/key.h | 8 +- + drivers/staging/vt6655/mac.c | 65 +- + drivers/staging/vt6655/mib.c | 54 +- + drivers/staging/vt6655/power.c | 35 +- + drivers/staging/vt6655/rf.c | 8 +- + drivers/staging/vt6655/rf.h | 8 +- + drivers/staging/vt6655/rxtx.c | 1128 +++++---- + drivers/staging/vt6655/rxtx.h | 166 +- + drivers/staging/vt6655/ttype.h | 27 - + drivers/staging/vt6655/upc.h | 39 +- + drivers/staging/vt6655/vntwifi.c | 4 - + drivers/staging/vt6655/wcmd.c | 155 +- + drivers/staging/vt6655/wcmd.h | 3 +- + drivers/staging/vt6655/wctl.c | 8 +- + drivers/staging/vt6655/wctl.h | 6 +- + drivers/staging/vt6655/wmgr.c | 387 ++-- + drivers/staging/vt6655/wmgr.h | 2 +- + drivers/staging/vt6655/wpa.c | 28 +- + drivers/staging/vt6655/wpa2.c | 20 +- + drivers/staging/vt6655/wpactl.c | 118 +- + drivers/staging/vt6655/wpactl.h | 6 +- + drivers/staging/vt6655/wroute.c | 14 +- + drivers/staging/vt6655/wroute.h | 3 +- + drivers/staging/vt6656/rxtx.c | 3 +- + drivers/staging/vt6656/usbpipe.c | 5 +- + drivers/staging/wlan-ng/prism2fw.c | 93 +- + drivers/staging/wlan-ng/prism2mgmt.c | 19 +- + drivers/staging/xillybus/xillybus_core.c | 41 +- + 598 files changed, 18114 insertions(+), 31877 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-accel-bmc150 + create mode 100644 Documentation/devicetree/bindings/iio/dac/max5821.txt + create mode 100644 drivers/iio/accel/bmc150-accel.c + create mode 100644 drivers/iio/adc/rockchip_saradc.c + create mode 100644 drivers/iio/adc/ti-adc128s052.c + create mode 100644 drivers/iio/dac/max5821.c + create mode 100644 drivers/staging/comedi/drivers/ni_labpc_common.c + create mode 100644 drivers/staging/comedi/drivers/ni_usb6501.c + create mode 100644 drivers/staging/dgnc/dgnc_utils.c + create mode 100644 drivers/staging/dgnc/dgnc_utils.h + delete mode 100644 drivers/staging/iio/frequency/ad5930.c + delete mode 100644 drivers/staging/iio/frequency/ad9850.c + delete mode 100644 drivers/staging/iio/frequency/ad9852.c + delete mode 100644 drivers/staging/iio/frequency/ad9910.c + delete mode 100644 drivers/staging/iio/frequency/ad9951.c + create mode 100644 drivers/staging/lustre/README.txt + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_heap.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lprocfs_status.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_acl.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_dlm.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_handles.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_lib.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_log.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_net.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_quota.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd_class.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd_support.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_idmap.h + rename drivers/staging/lustre/lustre/include/{linux => }/lustre_intent.h (100%) + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_linkea.h + delete mode 100644 drivers/staging/lustre/lustre/include/md_object.h + delete mode 100644 drivers/staging/lustre/lustre/libcfs/heap.c + delete mode 100644 drivers/staging/lustre/lustre/mgc/libmgc.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/idmap.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/linkea.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_lvfs.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_osd.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/llog_test.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/lu_ucred.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/md_attrs.c + delete mode 100644 drivers/staging/lustre/lustre/obdclass/mea.c + delete mode 100644 drivers/staging/lustre/lustre/obdecho/echo.c + delete mode 100644 drivers/staging/lustre/lustre/ptlrpc/nrs_crr.c + delete mode 100644 drivers/staging/nokia_h4p/Kconfig + delete mode 100644 drivers/staging/nokia_h4p/Makefile + delete mode 100644 drivers/staging/nokia_h4p/TODO + delete mode 100644 drivers/staging/nokia_h4p/hci_h4p.h + delete mode 100644 drivers/staging/nokia_h4p/nokia_core.c + delete mode 100644 drivers/staging/nokia_h4p/nokia_fw-bcm.c + delete mode 100644 drivers/staging/nokia_h4p/nokia_fw-csr.c + delete mode 100644 drivers/staging/nokia_h4p/nokia_fw-ti1273.c + delete mode 100644 drivers/staging/nokia_h4p/nokia_fw.c + delete mode 100644 drivers/staging/nokia_h4p/nokia_uart.c + delete mode 100644 drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c + delete mode 100644 drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c + rename drivers/staging/rtl8188eu/hal/{HalHWImg8188E_BB.c => bb_cfg.c} (54%) + create mode 100644 drivers/staging/rtl8188eu/hal/fw.c + create mode 100644 drivers/staging/rtl8188eu/hal/mac_cfg.c + delete mode 100644 drivers/staging/rtl8188eu/hal/odm_RegConfig8188E.c + create mode 100644 drivers/staging/rtl8188eu/hal/phy.c + rename drivers/staging/rtl8188eu/hal/{Hal8188EPwrSeq.c => pwrseq.c} (68%) + rename drivers/staging/rtl8188eu/hal/{HalPwrSeqCmd.c => pwrseqcmd.c} (60%) + create mode 100644 drivers/staging/rtl8188eu/hal/rf.c + create mode 100644 drivers/staging/rtl8188eu/hal/rf_cfg.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c + delete mode 100644 drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c + delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EPwrSeq.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_BB.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_MAC.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalHWImg8188E_RF.h + delete mode 100644 drivers/staging/rtl8188eu/include/HalPwrSeqCmd.h + create mode 100644 drivers/staging/rtl8188eu/include/fw.h + delete mode 100644 drivers/staging/rtl8188eu/include/odm_RegConfig8188E.h + create mode 100644 drivers/staging/rtl8188eu/include/phy.h + create mode 100644 drivers/staging/rtl8188eu/include/pwrseq.h + create mode 100644 drivers/staging/rtl8188eu/include/pwrseqcmd.h + create mode 100644 drivers/staging/rtl8188eu/include/rf.h + delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_rf.h + delete mode 100644 drivers/staging/unisys/include/commontypes.h +$ git am -3 ../patches/0001-staging-rtl8188eu-using-unique-names-is-good.patch +Applying: staging: rtl8188eu: using unique names is good +Using index info to reconstruct a base tree... +A drivers/staging/rtl8188eu/hal/HalHWImg8188E_BB.c +A drivers/staging/rtl8188eu/hal/HalHWImg8188E_MAC.c +A drivers/staging/rtl8188eu/hal/HalHWImg8188E_RF.c +M drivers/staging/rtl8188eu/hal/fw.c +M drivers/staging/rtl8188eu/hal/usb_halinit.c +M drivers/staging/rtl8188eu/include/fw.h +M drivers/staging/rtl8188eu/include/phy.h +Falling back to patching base and 3-way merge... +Auto-merging drivers/staging/rtl8188eu/include/phy.h +CONFLICT (content): Merge conflict in drivers/staging/rtl8188eu/include/phy.h +Recorded preimage for 'drivers/staging/rtl8188eu/include/phy.h' +Failed to merge in the changes. +Patch failed at 0001 staging: rtl8188eu: using unique names is good +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/next/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Merging char-misc/char-misc-next (69e273c0b0a3 Linux 3.17-rc3) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging cgroup/for-next (549cb2747e0f Merge branch 'for-3.18' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + kernel/cgroup.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) +Merging scsi/for-next (659c26fd547a Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/nsp32.c +Merge made by the 'recursive' strategy. + Documentation/scsi/ChangeLog.megaraid_sas | 14 ++ + drivers/message/fusion/mptbase.c | 8 +- + drivers/message/fusion/mptctl.c | 7 +- + drivers/scsi/aacraid/linit.c | 1 + + drivers/scsi/be2iscsi/be.h | 2 +- + drivers/scsi/be2iscsi/be_cmds.c | 40 +++- + drivers/scsi/be2iscsi/be_cmds.h | 24 +- + drivers/scsi/be2iscsi/be_iscsi.c | 31 ++- + drivers/scsi/be2iscsi/be_iscsi.h | 2 +- + drivers/scsi/be2iscsi/be_main.c | 40 +++- + drivers/scsi/be2iscsi/be_main.h | 8 +- + drivers/scsi/be2iscsi/be_mgmt.c | 2 +- + drivers/scsi/be2iscsi/be_mgmt.h | 2 +- + drivers/scsi/csiostor/csio_hw.h | 2 +- + drivers/scsi/csiostor/csio_isr.c | 24 +- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/dpt_i2o.c | 1 + + drivers/scsi/eata.c | 9 - + drivers/scsi/hpsa.c | 70 +++--- + drivers/scsi/megaraid/megaraid_sas.h | 9 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 348 ++++++++++++++++++---------- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 + + drivers/scsi/mpt2sas/mpt2sas_base.c | 6 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/nsp32.c | 2 +- + drivers/scsi/pm8001/pm8001_ctl.c | 4 +- + drivers/scsi/pm8001/pm8001_hwi.c | 8 + + drivers/scsi/pmcraid.c | 14 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 5 + + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_isr.c | 81 +++---- + drivers/scsi/qla2xxx/qla_mbx.c | 2 +- + drivers/scsi/qla2xxx/qla_mr.c | 2 +- + drivers/scsi/qla2xxx/qla_nx.c | 6 +- + drivers/scsi/qla2xxx/qla_os.c | 60 +++-- + drivers/scsi/qla2xxx/qla_target.c | 2 +- + drivers/scsi/scsi_debug.c | 103 ++++---- + drivers/scsi/scsi_error.c | 27 +-- + drivers/scsi/scsi_lib.c | 24 +- + drivers/scsi/sd.c | 6 +- + include/scsi/scsi_host.h | 1 + + 42 files changed, 603 insertions(+), 406 deletions(-) +Merging target-updates/for-next (df7c3d7ba056 target: target_core_ua_h: Add #define of include guard) +$ git merge target-updates/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1269 and retry the command. +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Merge made by the 'recursive' strategy. + drivers/infiniband/ulp/isert/ib_isert.c | 20 ++++--- + drivers/target/iscsi/iscsi_target_util.c | 2 + + drivers/target/target_core_fabric_configfs.c | 3 +- + drivers/target/target_core_transport.c | 86 ++++++++++++++-------------- + drivers/target/target_core_ua.h | 1 + + drivers/target/tcm_fc/tfc_sess.c | 2 +- + 6 files changed, 60 insertions(+), 54 deletions(-) +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (aa2293d82c29 pinctrl: single: AM437x: Add pinctrl compatibility) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/rockchip,pinctrl.txt | 6 +- + .../bindings/pinctrl/ti,omap-pinctrl.txt | 13 + + drivers/pinctrl/Kconfig | 7 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-imx21.c | 342 +++++++++++++++++++++ + drivers/pinctrl/pinctrl-imx23.c | 2 +- + drivers/pinctrl/pinctrl-imx25.c | 2 +- + drivers/pinctrl/pinctrl-imx27.c | 2 +- + drivers/pinctrl/pinctrl-imx28.c | 2 +- + drivers/pinctrl/pinctrl-imx35.c | 2 +- + drivers/pinctrl/pinctrl-imx50.c | 2 +- + drivers/pinctrl/pinctrl-imx51.c | 2 +- + drivers/pinctrl/pinctrl-imx53.c | 2 +- + drivers/pinctrl/pinctrl-imx6dl.c | 2 +- + drivers/pinctrl/pinctrl-imx6q.c | 2 +- + drivers/pinctrl/pinctrl-imx6sl.c | 3 +- + drivers/pinctrl/pinctrl-imx6sx.c | 2 +- + drivers/pinctrl/pinctrl-single.c | 14 + + drivers/pinctrl/pinctrl-tegra114.c | 2 +- + drivers/pinctrl/pinctrl-tegra124.c | 2 +- + drivers/pinctrl/pinctrl-tegra20.c | 2 +- + drivers/pinctrl/pinctrl-tegra30.c | 2 +- + drivers/pinctrl/sirf/pinctrl-atlas6.c | 129 +++++--- + drivers/pinctrl/sirf/pinctrl-prima2.c | 85 +++-- + drivers/pinctrl/sirf/pinctrl-sirf.c | 63 ++-- + drivers/pinctrl/spear/pinctrl-spear1310.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear1340.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear300.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear310.c | 2 +- + drivers/pinctrl/spear/pinctrl-spear320.c | 2 +- + include/dt-bindings/pinctrl/rockchip.h | 2 + + 31 files changed, 580 insertions(+), 125 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,omap-pinctrl.txt + create mode 100644 drivers/pinctrl/pinctrl-imx21.c +Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs) +$ git merge vhost/linux-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 2037 and retry the command. +Resolved 'drivers/vhost/net.c' using previous resolution. +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ac2713a977bd] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (42c526f8bc26 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 39 ++++ + .../devicetree/bindings/gpio/gpio-xgene.txt | 22 ++ + .../devicetree/bindings/gpio/mrvl-gpio.txt | 15 +- + Documentation/gpio/consumer.txt | 24 +- + Documentation/gpio/driver.txt | 3 +- + drivers/gpio/Kconfig | 10 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-adnp.c | 155 ++++--------- + drivers/gpio/gpio-bt8xx.c | 3 - + drivers/gpio/gpio-pca953x.c | 54 +---- + drivers/gpio/gpio-xgene.c | 250 +++++++++++++++++++++ + drivers/gpio/gpio-zynq.c | 32 +-- + drivers/gpio/gpiolib-acpi.c | 30 +-- + drivers/gpio/gpiolib.c | 18 +- + include/linux/gpio/consumer.h | 105 +++++---- + include/linux/gpio/driver.h | 3 +- + 16 files changed, 517 insertions(+), 247 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xgene.txt + create mode 100644 drivers/gpio/gpio-xgene.c +Merging dma-mapping/dma-mapping-next (b4bbb107d73b dma-mapping: Provide write-combine allocations) +$ git merge dma-mapping/dma-mapping-next +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/include/asm/dma-mapping.h | 16 ---------------- + arch/s390/Kconfig | 5 +---- + arch/s390/include/asm/dma-mapping.h | 31 +++++++++++++++++++++---------- + include/asm-generic/dma-mapping-common.h | 8 -------- + include/linux/dma-mapping.h | 26 ++++++++++++++++++++++++++ + 5 files changed, 48 insertions(+), 38 deletions(-) +Merging pwm/for-next (70145f87139f pwm: Fix uninitialized warnings in pwm_get()) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 19 ++- + .../devicetree/bindings/pwm/pwm-rockchip.txt | 4 +- + drivers/pwm/Kconfig | 21 +++- + drivers/pwm/Makefile | 2 + + drivers/pwm/core.c | 31 +++-- + drivers/pwm/pwm-fsl-ftm.c | 90 +++++++------- + drivers/pwm/pwm-imx.c | 71 ++++++++--- + drivers/pwm/pwm-lpss-pci.c | 64 ++++++++++ + drivers/pwm/pwm-lpss-platform.c | 68 ++++++++++ + drivers/pwm/pwm-lpss.c | 137 +++------------------ + drivers/pwm/pwm-lpss.h | 32 +++++ + drivers/pwm/pwm-rockchip.c | 57 +++++++-- + 12 files changed, 387 insertions(+), 209 deletions(-) + create mode 100644 drivers/pwm/pwm-lpss-pci.c + create mode 100644 drivers/pwm/pwm-lpss-platform.c + create mode 100644 drivers/pwm/pwm-lpss.h +Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry) +$ git merge userns/for-next +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 1266 and retry the command. +Auto-merging fs/nfs/client.c +Auto-merging fs/namespace.c +Merge made by the 'recursive' strategy. + fs/namespace.c | 9 ++++ + fs/nfs/client.c | 4 +- + .../selftests/mount/unprivileged-remount-test.c | 51 ++++++++++++---------- + 3 files changed, 38 insertions(+), 26 deletions(-) +Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (16eeaec77922 clk: at91: fix div by zero in USB clock driver) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 + + .../clock/renesas,rcar-gen2-cpg-clocks.txt | 1 + + drivers/clk/at91/clk-pll.c | 160 +++++++++++---------- + drivers/clk/at91/clk-usb.c | 20 ++- + drivers/clk/mvebu/common.c | 9 +- + drivers/clk/mvebu/common.h | 2 + + drivers/clk/mvebu/kirkwood.c | 102 ++++++++++++- + drivers/clk/rockchip/clk-rk3188.c | 7 + + drivers/clk/rockchip/clk-rk3288.c | 7 + + drivers/clk/rockchip/clk.c | 73 +++++++++- + drivers/clk/rockchip/clk.h | 1 + + drivers/clk/shmobile/clk-rcar-gen2.c | 1 + + drivers/cpufreq/kirkwood-cpufreq.c | 14 +- + 13 files changed, 297 insertions(+), 101 deletions(-) +Merging random/dev (13aa93c70e71 random: add and use memzero_explicit() for clearing data) +$ git merge random/dev +Auto-merging drivers/char/random.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 8 ++++---- + include/linux/string.h | 5 +++-- + lib/string.c | 16 ++++++++++++++++ + 3 files changed, 23 insertions(+), 6 deletions(-) +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +warning: inexact rename detection was skipped due to too many files. +warning: you may want to set your merge.renamelimit variable to at least 8455 and retry the command. +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +Merging arm64-hugepages/for-next/hugepages () +$ git merge arm64-hugepages/for-next/hugepages +merge: arm64-hugepages/for-next/hugepages - not something we can merge +Merging aio/master (7be141d05549 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (fae6d26ae729 arm64: LLVMLinux: Use current_stack_pointer in kernel/traps.c) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/ptrace.h | 5 ++--- + arch/arm/include/asm/thread_info.h | 9 +++++++-- + arch/arm/kernel/return_address.c | 3 +-- + arch/arm/kernel/stacktrace.c | 4 +--- + arch/arm/kernel/unwind.c | 3 +-- + arch/arm64/include/asm/thread_info.h | 9 +++++++-- + arch/arm64/kernel/stacktrace.c | 3 +-- + arch/arm64/kernel/traps.c | 3 +-- + 8 files changed, 21 insertions(+), 18 deletions(-) +Merging rd-docs/master (330261642606 Documentation: make functions static to avoid prototype warnings) +$ git merge rd-docs/master +Merge made by the 'recursive' strategy. + Documentation/arm/SH-Mobile/vrl4.c | 6 +++--- + Documentation/prctl/disable-tsc-ctxt-sw-stress-test.c | 11 ++++++----- + Documentation/prctl/disable-tsc-on-off-stress-test.c | 7 ++++--- + Documentation/prctl/disable-tsc-test.c | 5 +++-- + 4 files changed, 16 insertions(+), 13 deletions(-) +Merging akpm-current/current (14e81f95f9a0 scripts/headers_install.sh: fix error handling) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'drivers/clk/rockchip/clk.c' +Recorded preimage for 'drivers/clk/rockchip/clk.h' +Resolved 'scripts/checkpatch.pl' using previous resolution. +Auto-merging scripts/headers_install.sh +Auto-merging scripts/checkpatch.pl +CONFLICT (content): Merge conflict in scripts/checkpatch.pl +Auto-merging mm/zsmalloc.c +Auto-merging mm/memory.c +Auto-merging mm/memblock.c +Auto-merging kernel/watchdog.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/resource.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/debug/debug_core.c +Auto-merging init/Kconfig +Auto-merging include/linux/string.h +Auto-merging include/linux/pagemap.h +Auto-merging include/asm-generic/dma-mapping-common.h +Auto-merging fs/proc/base.c +Auto-merging fs/internal.h +Auto-merging fs/cifs/smb2pdu.c +Auto-merging fs/cifs/smb2ops.c +Auto-merging fs/cifs/smb2file.c +Auto-merging fs/cifs/sess.c +Auto-merging fs/cifs/file.c +Auto-merging fs/buffer.c +Auto-merging drivers/clk/rockchip/clk.h +CONFLICT (content): Merge conflict in drivers/clk/rockchip/clk.h +Auto-merging drivers/clk/rockchip/clk.c +CONFLICT (content): Merge conflict in drivers/clk/rockchip/clk.c +Auto-merging drivers/clk/rockchip/clk-rk3288.c +Auto-merging drivers/clk/rockchip/clk-rk3188.c +Auto-merging drivers/block/zram/zram_drv.h +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging block/bio-integrity.c +Auto-merging arch/x86/purgatory/Makefile +Auto-merging arch/x86/Kconfig +Removing arch/score/include/asm/sections.h +Removing arch/mn10300/include/asm/sections.h +Removing arch/m32r/include/asm/sections.h +Removing arch/cris/include/asm/sections.h +Auto-merging arch/arm/Kconfig +Removing arch/alpha/include/asm/sections.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/clk/rockchip/clk.c'. +Recorded resolution for 'drivers/clk/rockchip/clk.h'. +[master 68c9c8751e27] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-devices-node | 8 - + Documentation/ABI/testing/sysfs-block-zram | 36 + + Documentation/ABI/testing/sysfs-devices-memory | 8 + + Documentation/blockdev/zram.txt | 27 +- + Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 3 + + Documentation/filesystems/autofs4.txt | 520 +++++++++++++ + Documentation/filesystems/proc.txt | 2 + + Documentation/leds/leds-class.txt | 3 - + Documentation/memory-hotplug.txt | 11 +- + Documentation/printk-formats.txt | 6 + + MAINTAINERS | 18 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/sections.h | 7 - + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/kernel/process.c | 12 +- + arch/arm/mm/dma-mapping.c | 210 ++---- + arch/arm/mm/init.c | 2 +- + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/process.c | 3 +- + arch/arm64/mm/dma-mapping.c | 164 ++++- + arch/cris/include/asm/Kbuild | 1 + + arch/cris/include/asm/sections.h | 7 - + arch/m32r/include/asm/Kbuild | 1 + + arch/m32r/include/asm/sections.h | 7 - + arch/m68k/kernel/sys_m68k.c | 21 +- + arch/mn10300/include/asm/Kbuild | 1 + + arch/mn10300/include/asm/sections.h | 1 - + arch/powerpc/include/asm/pgtable.h | 57 +- + arch/powerpc/include/asm/pte-common.h | 5 + + arch/score/include/asm/Kbuild | 1 + + arch/score/include/asm/sections.h | 6 - + arch/sh/mm/gup.c | 2 + + arch/x86/Kconfig | 1 - + arch/x86/include/asm/numa.h | 1 - + arch/x86/include/asm/pgtable_64.h | 3 +- + arch/x86/include/asm/pgtable_types.h | 14 + + arch/x86/mm/fault.c | 2 +- + arch/x86/mm/init_64.c | 36 +- + arch/x86/mm/ioremap.c | 20 +- + arch/x86/mm/numa.c | 123 ++-- + arch/x86/platform/efi/efi-bgrt.c | 36 +- + arch/x86/purgatory/Makefile | 3 +- + block/bio-integrity.c | 2 - + block/genhd.c | 2 +- + drivers/base/dma-mapping.c | 70 ++ + drivers/base/memory.c | 42 ++ + drivers/base/node.c | 19 +- + drivers/block/zram/zram_drv.c | 122 +++- + drivers/block/zram/zram_drv.h | 8 + + drivers/clk/rockchip/clk-rk3188.c | 2 + + drivers/clk/rockchip/clk-rk3288.c | 2 + + drivers/clk/rockchip/clk.c | 25 + + drivers/clk/rockchip/clk.h | 1 + + drivers/clk/samsung/clk-s3c2412.c | 29 + + drivers/clk/samsung/clk-s3c2443.c | 19 + + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 6 + + drivers/input/leds.c | 249 +++++++ + drivers/leds/Kconfig | 3 - + drivers/misc/ti-st/st_core.c | 2 +- + drivers/power/reset/restart-poweroff.c | 3 +- + drivers/rtc/rtc-pcf8583.c | 18 +- + drivers/rtc/rtc-s3c.c | 851 ++++++++++++++-------- + drivers/tty/Kconfig | 4 + + drivers/tty/vt/keyboard.c | 110 ++- + drivers/video/backlight/backlight.c | 2 - + drivers/virtio/Kconfig | 1 + + drivers/virtio/virtio_balloon.c | 77 +- + drivers/watchdog/alim7101_wdt.c | 42 +- + drivers/watchdog/moxart_wdt.c | 32 +- + drivers/watchdog/s3c2410_wdt.c | 36 + + drivers/watchdog/sunxi_wdt.c | 31 +- + fs/autofs4/autofs_i.h | 6 +- + fs/autofs4/dev-ioctl.c | 2 +- + fs/autofs4/expire.c | 210 +++--- + fs/autofs4/root.c | 62 +- + fs/befs/btree.c | 53 +- + fs/block_dev.c | 7 + + fs/buffer.c | 26 +- + fs/cifs/cifsacl.c | 2 +- + fs/cifs/cifssmb.c | 20 +- + fs/cifs/file.c | 4 +- + fs/cifs/sess.c | 2 +- + fs/cifs/smb2file.c | 4 +- + fs/cifs/smb2misc.c | 38 +- + fs/cifs/smb2ops.c | 2 +- + fs/cifs/smb2pdu.c | 2 +- + fs/cifs/smb2pdu.h | 28 +- + fs/eventpoll.c | 3 +- + fs/ext4/fsync.c | 5 +- + fs/hfsplus/catalog.c | 89 ++- + fs/hfsplus/dir.c | 11 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/super.c | 4 +- + fs/internal.h | 5 + + fs/mpage.c | 25 +- + fs/ocfs2/alloc.c | 28 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 37 +- + fs/ocfs2/cluster/heartbeat.c | 19 + + fs/ocfs2/cluster/heartbeat.h | 1 + + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmdomain.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 22 +- + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 2 +- + fs/ocfs2/inode.c | 10 +- + fs/ocfs2/stack_user.c | 2 +- + fs/proc/base.c | 36 +- + fs/proc/internal.h | 5 +- + fs/proc/kcore.c | 4 +- + fs/proc/meminfo.c | 6 + + fs/proc/page.c | 3 + + fs/proc/task_mmu.c | 272 ++++--- + fs/proc/task_nommu.c | 89 ++- + include/asm-generic/dma-mapping-common.h | 9 + + include/asm-generic/pgtable.h | 27 +- + include/linux/balloon_compaction.h | 189 +---- + include/linux/compaction.h | 24 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/genalloc.h | 7 + + include/linux/gfp.h | 2 +- + include/linux/huge_mm.h | 2 +- + include/linux/input.h | 21 + + include/linux/kernel.h | 32 +- + include/linux/list.h | 1 + + include/linux/memory_hotplug.h | 1 + + include/linux/mempolicy.h | 7 +- + include/linux/migrate.h | 14 +- + include/linux/mm.h | 30 +- + include/linux/mmdebug.h | 10 + + include/linux/mmzone.h | 3 + + include/linux/pagemap.h | 18 +- + include/linux/reboot.h | 3 + + include/linux/rmap.h | 2 +- + include/linux/slab.h | 64 +- + include/linux/string.h | 1 + + include/linux/swap.h | 16 - + include/linux/zsmalloc.h | 2 +- + include/uapi/linux/kernel-page-flags.h | 1 + + include/uapi/linux/prctl.h | 27 + + init/Kconfig | 18 +- + init/initramfs.c | 34 +- + ipc/ipc_sysctl.c | 3 +- + ipc/shm.c | 7 - + ipc/util.c | 20 +- + kernel/acct.c | 14 +- + kernel/async.c | 8 +- + kernel/debug/debug_core.c | 9 +- + kernel/debug/kdb/kdb_debugger.c | 4 + + kernel/debug/kdb/kdb_main.c | 4 +- + kernel/printk/printk.c | 13 +- + kernel/reboot.c | 81 ++ + kernel/resource.c | 36 + + kernel/sched/fair.c | 2 +- + kernel/sys.c | 487 +++++++++---- + kernel/sysctl.c | 7 - + kernel/time/posix-timers.c | 57 +- + kernel/watchdog.c | 18 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++++++ + lib/dynamic_debug.c | 17 +- + lib/genalloc.c | 49 ++ + lib/vsprintf.c | 20 +- + mm/Kconfig | 7 +- + mm/Makefile | 3 +- + mm/balloon_compaction.c | 227 +++--- + mm/cma.c | 21 + + mm/compaction.c | 660 +++++++++++------ + mm/huge_memory.c | 26 +- + mm/hugetlb.c | 14 +- + mm/internal.h | 26 +- + mm/interval_tree.c | 2 +- + mm/memblock.c | 14 +- + mm/memory.c | 8 + + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 130 ++-- + mm/migrate.c | 29 +- + mm/mlock.c | 4 +- + mm/mmap.c | 50 +- + mm/mremap.c | 3 +- + mm/nobootmem.c | 2 + + mm/page_alloc.c | 246 +++++-- + mm/rmap.c | 8 +- + mm/shmem.c | 2 + + mm/slab.c | 84 +-- + mm/slab.h | 33 + + mm/slab_common.c | 13 +- + mm/slob.c | 2 - + mm/slub.c | 11 + + mm/swap_state.c | 2 + + mm/util.c | 53 +- + mm/vmalloc.c | 20 +- + mm/vmscan.c | 79 +- + mm/vmstat.c | 149 +++- + mm/zsmalloc.c | 30 +- + scripts/checkpatch.pl | 11 +- + scripts/headers_install.sh | 4 +- + tools/testing/selftests/vm/Makefile | 1 + + tools/testing/selftests/vm/transhuge-stress.c | 144 ++++ + tools/vm/page-types.c | 1 + + 205 files changed, 5624 insertions(+), 2711 deletions(-) + create mode 100644 Documentation/filesystems/autofs4.txt + delete mode 100644 arch/alpha/include/asm/sections.h + delete mode 100644 arch/cris/include/asm/sections.h + delete mode 100644 arch/m32r/include/asm/sections.h + delete mode 100644 arch/mn10300/include/asm/sections.h + delete mode 100644 arch/score/include/asm/sections.h + create mode 100644 drivers/input/leds.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 tools/testing/selftests/vm/transhuge-stress.c +$ git am -3 ../patches/prctl-pr_set_mm-introduce-pr_set_mm_map-operation-v4-fix.patch +Applying: headers: prctl.h -- Add missing linux/types.h +fatal: sha1 information is lacking or useless (include/uapi/linux/prctl.h). +Repository lacks necessary blobs to fall back on 3-way merge. +Cannot fall back to three-way merge. +Patch failed at 0001 headers: prctl.h -- Add missing linux/types.h +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/next/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am -3 ../patches/common-dma-mapping-introduce-common-remapping-functions-fix.patch +Applying: common: dma-mapping: Swap function order +fatal: sha1 information is lacking or useless (drivers/base/dma-mapping.c). +Repository lacks necessary blobs to fall back on 3-way merge. +Cannot fall back to three-way merge. +Patch failed at 0001 common: dma-mapping: Swap function order +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/next/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am -3 ../patches/common-dma-mapping-introduce-common-remapping-functions-fix-2.patch +Applying: common: dma-mapping: Protect remapping functions with CONFIG_MMU +fatal: sha1 information is lacking or useless (drivers/base/dma-mapping.c). +Repository lacks necessary blobs to fall back on 3-way merge. +Cannot fall back to three-way merge. +Patch failed at 0001 common: dma-mapping: Protect remapping functions with CONFIG_MMU +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/next/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ 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' +Branch akpm set up to track remote branch akpm/master from origin. +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/gpio/gpio-zevio.c: fix build +Applying: x86, vdso: fix vdso2c's special_pages error checking +Applying: include/linux: remove strict_strto* definitions +Applying: lib / string_helpers: move documentation to c-file +Applying: lib / string_helpers: refactoring the test suite +Applying: lib / string_helpers: introduce string_escape_mem() +Applying: lib/vsprintf: add %*pE[achnops] format specifier +Applying: lib-vsprintf-add-%pe-format-specifier-fix +Applying: wireless: libertas: print esaped string via %*pE +Applying: wireless: ipw2x00: print SSID via %*pE +Applying: wireless: hostap: proc: print properly escaped SSID +Applying: lib80211: remove unused print_ssid() +Applying: staging: wlan-ng: use %*pEhp to print SN +Applying: staging: rtl8192e: use %*pEn to escape buffer +Applying: staging: rtl8192u: use %*pEn to escape buffer +Applying: kernel/watchdog.c: control hard lockup detection default +Applying: watchdog-control-hard-lockup-detection-default-fix +Applying: watchdog, nmi: Fix compile issues on sparc +Applying: kvm: ensure hard lockup detection is disabled by default +Applying: mm: replace remap_file_pages() syscall with emulation +Applying: fat: add i_disksize to represent uninitialized size +Applying: fat: add fat_fallocate operation +Applying: fat: zero out seek range on _fat_get_block +Applying: fat: fallback to buffered write in case of fallocated region on direct IO +Applying: fat: permit to return phy block number by fibmap in fallocated region +Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + ba954247d0c5...56dac764e038 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (56dac764e038 mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing mm/fremap.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/filesystems/vfat.txt | 10 + + Documentation/printk-formats.txt | 32 +++ + Documentation/vm/remap_file_pages.txt | 7 +- + arch/x86/kernel/kvm.c | 8 + + arch/x86/vdso/vdso2c.h | 12 +- + drivers/gpio/gpio-zevio.c | 4 + + drivers/net/wireless/hostap/hostap_proc.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 22 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 270 +++++++-------------- + drivers/net/wireless/ipw2x00/libipw_rx.c | 65 +++--- + drivers/net/wireless/ipw2x00/libipw_wx.c | 16 +- + drivers/net/wireless/libertas/cfg.c | 8 +- + drivers/net/wireless/libertas/mesh.c | 7 +- + drivers/staging/rtl8192e/rtllib.h | 14 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 14 +- + drivers/staging/wlan-ng/prism2sta.c | 28 +-- + drivers/w1/w1_int.c | 3 +- + fs/fat/cache.c | 70 ++++-- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 78 ++++++- + fs/fat/inode.c | 87 ++++++- + include/linux/fs.h | 8 +- + include/linux/kernel.h | 4 - + include/linux/nmi.h | 13 ++ + include/linux/string_helpers.h | 65 +++--- + include/net/lib80211.h | 5 - + kernel/watchdog.c | 50 +++- + lib/string_helpers.c | 312 +++++++++++++++++++++++++ + lib/test-string_helpers.c | 250 +++++++++++++++++++- + lib/vsprintf.c | 71 ++++++ + mm/Makefile | 2 +- + mm/backing-dev.c | 35 +++ + mm/fremap.c | 283 ---------------------- + mm/mmap.c | 69 ++++++ + mm/nommu.c | 8 - + net/wireless/lib80211.c | 32 --- + 37 files changed, 1253 insertions(+), 727 deletions(-) + delete mode 100644 mm/fremap.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..b723bb311473 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,227 @@ +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.15-rc7 +Unknown BASE +Importing rd-docs based on 3.17-rc1 +Unknown BASE +Importing jdelvare-hwmon based on 3.14-rc3 +Unknown BASE +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 +HEAD is now at 6d0abeca3242 Linux 3.14-rc3 +$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch +Applying: hwmon: (f71805f) Fix author's address +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch +Applying: hwmon: (lm63) Add additional sysfs group for temp2_type attribute +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch +Applying: hwmon: (lm63) Introduce 'dev' variable to point to client->dev +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch +Applying: hwmon: (lm63) Create all sysfs groups in one call +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-05-avoid-double-initialization.patch +Applying: hwmon: (lm63) Avoid initializing the same field twice +$ git am ../quilt/jdelvare-hwmon/hwmon-adm1021-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (adm1021) Convert to use devm_hwmon_device_register_with_groups +$ git am ../quilt/jdelvare-hwmon/hwmon-lm80-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (lm80) Convert to use devm_hwmon_device_register_with_groups +$ git am ../quilt/jdelvare-hwmon/hwmon-pc87360-avoid-double-initializations.patch +Applying: hwmon: (pc87360) Avoid initializing the same field twice +$ git am ../quilt/jdelvare-hwmon/hwmon-avoid-double-initializations.patch +Applying: hwmon: Avoid initializing the same field twice +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-create-most-optional.patch +Applying: hwmon: (lm90) Create most optional attributes with sysfs_create_group +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-always-use-the-dev.patch +Applying: hwmon: (lm90) Always use the dev variable in the probe function +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-create-all-sysfs-groups.patch +Applying: hwmon: (lm90) Create all sysfs groups in one call +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-04-convert-to-use.patch +Applying: hwmon: (lm90) Convert to use hwmon_device_register_with_groups +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + c7208164e66f...3a3583e25e63 master -> jdelvare-hwmon/master (forced update) +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.14-rc3 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch +Applying: hwmon: (f71805f) Fix author's address +error: patch failed: drivers/hwmon/f71805f.c:1648 +error: drivers/hwmon/f71805f.c: patch does not apply +Patch failed at 0001 hwmon: (f71805f) Fix author's address +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch +Applying: hwmon: (lm63) Add additional sysfs group for temp2_type attribute +error: patch failed: drivers/hwmon/lm63.c:915 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Add additional sysfs group for temp2_type attribute +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch +Applying: hwmon: (lm63) Introduce 'dev' variable to point to client->dev +error: patch failed: drivers/hwmon/lm63.c:1038 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Introduce 'dev' variable to point to client->dev +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch +Applying: hwmon: (lm63) Create all sysfs groups in one call +error: patch failed: drivers/hwmon/lm63.c:157 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Create all sysfs groups in one call +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch +Applying: hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups +error: patch failed: drivers/hwmon/lm63.c:155 +error: drivers/hwmon/lm63.c: patch does not apply +Patch failed at 0001 hwmon: (lm63) Convert to use devm_hwmon_device_register_with_groups +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +Importing jdelvare-hwmon based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/jdelvare-hwmon/hwmon-f71805f-fix-author-address.patch +Applying: hwmon: (f71805f) Fix author's address +error: patch failed: drivers/hwmon/f71805f.c:1648 +error: drivers/hwmon/f71805f.c: patch does not apply +Patch failed at 0001 hwmon: (f71805f) Fix author's address +The copy of the patch that failed is found in: + /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply/patch +When you have resolved this problem, run "git am --continue". +If you prefer to skip this patch, run "git am --skip" instead. +To restore the original branch and stop patching, run "git am --abort". +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-01-add-additional-sysfs-group-for-temp2_type-attribute.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-02-introduce-dev-variable-to-point-to-client-dev.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-03-create-all-sysfs-groups-in-one-call.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-04-convert-to-use-devm_hwmon_device_register_with_groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm63-05-avoid-double-initialization.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-adm1021-convert-to-use-devm_hwmon_device_register_with_groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm80-convert-to-use-devm_hwmon_device_register_with_groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-pc87360-avoid-double-initializations.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-avoid-double-initializations.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-01-create-most-optional.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-02-always-use-the-dev.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-03-create-all-sysfs-groups.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ git am ../quilt/jdelvare-hwmon/hwmon-lm90-04-convert-to-use.patch +previous rebase directory /home/broonie/git/next/sfr/quilt-tmp/.git/rebase-apply still exists but mbox given. +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + 3a3583e...7d1311b master -> jdelvare-hwmon/master (forced update) +Importing jdelvare-hwmon based on 3.17-rc1 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.17-rc1 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.17-rc1 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.15-rc7 + quilt series is empty +$ git branch -f jdelvare-hwmon/master c7208164e66f63e3ec1759b98087849286410741 +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9 +HEAD is now at 7d1311b93e58 Linux 3.17-rc1 +$ git am ../quilt/rd-docs/001-docum-use-subdiry-avoid-builtin.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/002-docum-add-make-more-targets.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/003-docum-funcs-static.patch +Applying: Documentation: make functions static to avoid prototype warnings +$ git am ../quilt/rd-docs/004-docum-misc-warnings.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-submit-patches-add-gregkh-page.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/media-v4l2-pci-skel-dep-pci.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-i2c-fix-interface-example.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-fs-seq-open-release-private.patch +Patch format detection failed. +$ git am ../quilt/rd-docs/docum-misc-devices-freefall.patch +Patch format detection failed. +$ cd /home/broonie/git/next/sfr/next +$ git fetch -f ../quilt-tmp master:rd-docs/master +From ../quilt-tmp + + 1f65b1aaaa0a...330261642606 master -> rd-docs/master (forced update) +Importing jdelvare-hwmon based on 3.15-rc7 +Unchanged quilt series jdelvare-hwmon +Importing rd-docs based on 3.17-rc1 +Unchanged quilt series rd-docs diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..278540359683 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20140903 |