diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-17 13:09:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-11-17 13:09:19 +1100 |
| commit | e483c0d725bc7f806f96231a0d5ac894c70fd3aa (patch) | |
| tree | 92c8eef26b670f9e3588e7067bdadecb0344f962 | |
| parent | a0bab9bf631ead38ba92ab1183da77bd9c15c840 (diff) | |
Add linux-next specific files for 20151117next-20151117
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 231 | ||||
| -rw-r--r-- | Next/Trees | 233 | ||||
| -rw-r--r-- | Next/merge.log | 2152 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 2621 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..63fdafbc63e9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,231 @@ +Name SHA1 +---- ---- +origin 8005c49d9aea74d382f474ce11afbbc7d7130bec +fixes 25cb62b76430a91cc6195f902e61c2cb84ade622 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 049e6dde7e57f0054fdc49102e7ef4830c698b46 +arm-current 38850d786a799c3ff2de0dc1980902c3263698dc +m68k-current bab84fa9cc09dfa9702029f83ea6bf8bf5ae96af +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes 1451ad03fac3e86948728e0b11f63dee73d3106c +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 2c302e7e41050dbc174d50b58ad42eedf5dbd6fa +net f1a454a37618b819f2528ccd234f77a02b3a6016 +ipsec a8a572a6b5f2a79280d6e302cb3c1cb1fbaeb3e8 +ipvs 086f332167d64b645d37405854f049b9ad7371ab +sound-current a91e627e3f0ed820b11d86cdc04df38f65f33a70 +pci-current 8005c49d9aea74d382f474ce11afbbc7d7130bec +wireless-drivers 761d4be5cf666973db317aab944b45bb07fe0a4f +driver-core.current 8005c49d9aea74d382f474ce11afbbc7d7130bec +tty.current 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb.current 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb-gadget-fixes 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb-serial-fixes 59536da34513c594af2a6fd35ba65ea45b6960a1 +usb-chipidea-fixes f256896afdb62b3b420e0f8f685d7ce3e7236556 +staging.current 8005c49d9aea74d382f474ce11afbbc7d7130bec +char-misc.current 8005c49d9aea74d382f474ce11afbbc7d7130bec +input-current bbdb5c22e12507e7f1637091bc24fe4d33e128e5 +crypto-current 176155dac13f528e0a58c14dc322623219365d91 +ide 1b1050cdc5cdde43177b375b5f22dc070d45d8f8 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 275d7d44d802ef271a42dc87ac091a495ba72fc5 +vfio-fixes 4bc94d5dc95d3a2159d821b39277477e69507f67 +kselftest-fixes ae7858180510d6fd0dfaf66d209bc6103db1678f +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes fd0fe6acf1dd88aabfbf383f7e4c16315387a7b7 +asm-generic 4008cb3ad223e39273b9cdfa578d04861b197c86 +arc b8628f3fe41c999b003c541c078312fcead960d6 +arm 8005c49d9aea74d382f474ce11afbbc7d7130bec +arm-perf 8005c49d9aea74d382f474ce11afbbc7d7130bec +arm-soc 62212c08e1f0b82076aa0b4193f6e91028458a6d +at91 c544ee640869d6b9a5c6a59a5f6f38db84b99763 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +berlin 27527ea5f2fd84a908f8ff815ab7a1ab52862fa7 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs f843df81257a398e0d5917fb9a32a71c5ce75890 +keystone 99d59777c0896a4b34cd4d10fc88a1c538fc0301 +mvebu 2a9e275d2fbfc0bd5ee01b718a19ccb1fd99c4ee +omap f2a148747f11a1bd36d728cff1ee54171dea305f +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +qcom fcbba086b45665b78db0373972969994ec73cf61 +renesas c7aba848d39f7871a6b101ed82097563d324bc94 +rockchip 55e899c44d109208ecb12e4befc7df27062194c3 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 8005c49d9aea74d382f474ce11afbbc7d7130bec +samsung-krzk f189f9be0d4d430c9fd04f37717e06e20c514720 +sunxi 7022e5f742466873914257295f5b358c7a5668ae +tegra cd48d86d7f3c9402996004003bd21b11993f9d4b +arm64 01b305a234943c25c336a6f2f77932a4eaf125fa +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 918fc2ee791ea26b95556bafab1f55aa25df5c6d +h8300 2a9c839862214d48cdade275cb1a89423ce47f41 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k bab84fa9cc09dfa9702029f83ea6bf8bf5ae96af +m68knommu 4ac313111018cb44ecc250445de5ccb93026a980 +metag f23d0e2468bc538e8c33223af8963ef40b7515bf +microblaze b14132797d8041a42e03f4ffa1e722da1425adfb +mips 4b58ce41dcd3103f9966a29603c58cdd8e465361 +nios2 bb3fc5ddef93836a36a39308cf7eca82ef0a1c4c +parisc-hd 6a13feb9c82803e2b815eca72fa7a9f5561d7861 +powerpc 8005c49d9aea74d382f474ce11afbbc7d7130bec +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl e1f580e8ced56d7c0a2b096e00e8b8e861d13671 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 8509e2d6612d18ff91593772b1598424209c25a8 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 09745f38a74eb2e5bb65dd49e7c225cd5180e932 +uml 2eb5f31bc4ea24bb293e82934cfa1cce9573304b +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2 +btrfs 3a9508b0221dfd290b95fb0ab199958fe078bbdf +ceph 583d0fef756a7615e50f0f68ea0892a497d03971 +cifs e7da2f463700a677c878776c42078a90b4d5cd1c +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 d4eb6dee471250661a5183a7336b18c85990e26d +ext4 be69e1c19f0efb091f29521715c380842fa4cd7e +f2fs 12b76f3bf336388916ddf8047156f9e9993ff4e9 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0b5da8db145bfd44266ac964a2636a0cf8d7c286 +gfs2 8f090dc672e49eaab01011a2b09390860c587eed +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs 941c3ff3102ccce440034d59cf9e4e9cc10b720d +nfsd ee8e8bf3b78e8babfda140cc4da53fb4651ef6b6 +orangefs 555fa0fa618b846c5b38406347b7d53ace320ac6 +overlayfs 257f871993474e2bde6c497b54022c362cf398e1 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs 3053600ed4f71115631258f0d64eca0d10b11bdc +ubifs 8c1c5f263833ec2dc8fd716cf4281265c485d7ad +xfs 4e14e49a91e18098fd8ef30743972e0c3cb727c1 +file-locks 95ace75414f312f9a7b93d873f386987b92a5301 +vfs 1a487dec990b3e22384202f53198a7605a238056 +pci 8005c49d9aea74d382f474ce11afbbc7d7130bec +hid b516a293d7eb8bbbbb2dc0c5620f6c031f0130a4 +i2c 121c7794864ca6f5807611588b740e6e1a7418b1 +jdelvare-hwmon 69bb8a38c5a93464064c8acea053a88224e8059c +dmi 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 +hwmon-staging 18ed6787d9fd80699f85e9e1a5baadc22cf6de63 +v4l-dvb 8132ccfb864a43e391a803caf69b3807c3bb4249 +kbuild 674327f76bb14a57f1b362d7893e961cfc87f729 +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +libata fca9051bec79968a38ee944c55030ab15f605ada +pm f751cc4a8d65e47d44984a32abe6b66a0fdf376c +idle fa16ab4806c14510200eaf75886e97bee47f2b9a +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 7c5b2759bf8c2cbc60e5560c72cf51a2628f6d30 +thermal-soc 84f0e490bee0684bd00c8ee02b15487d58bcea9f +ieee1394 100ceb66d5c40cc0c7018e06a9474302470be73c +dlm a6b1533e9a57d76cd3d9b7649d29ac604b1874b8 +swiotlb 9d99c7123c9af5f47a2037933a3ffaec3e37efad +slave-dma 14d34dad30f6eef7c7e4663292acf5687747699f +net-next c5a37883f42be712a989e54d5d6c0159b0e56599 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next c5a37883f42be712a989e54d5d6c0159b0e56599 +wireless-drivers-next 8aaa878de83a0de3833f5b00bc822dbcd403ec36 +bluetooth fa8384d37f99c88e184bfcc1794e9f4bc33e4f9d +rdma db7489e07669073970358b6cacf6a9dd8dc9275e +mtd 9ca641b0f02a3a1eedbc8c296e695326da9bbaf9 +l2-mtd e727ee86d9e51c4f3fd166c1540d23f211e7f37a +crypto 79960943fdc114fd4583c9ab164b5c89da7aa601 +drm f20780f3e8feec0eebcf9fb41e1d90202fffaeff +drm-panel f1811a8a641329d0dada7c4db7e29ce5ae32a10b +drm-intel 1f38089cb73aa39a20d8efddadd6779fc361a892 +drm-tegra 2bcdcbfae2895764372ef973a969f395a548f1ea +drm-misc 1c2260589ad88bc6e5a41f2e95e40655dbce2427 +drm-exynos 628aea2df786c8ccb7b32729c38c9c704be648ca +drm-msm a9ee34b70e07ce942806eda154e48ea3f754a76f +sound 3c7a09358729e64119669f454fb1ac3c5cd20b63 +sound-asoc 3fc80330c3c92a9b1bf214143d10d7bdf5c5fb04 +modules d1189c63ea5e3272dc390a83e1235f142b739eb4 +input 5e0baca8b3247f459af50947eaafc68bb8168b33 +block 4ef4e4105a25e0b95d7b1d402ed9457da7afe478 +device-mapper b36b8a1fc5db9bea82c0f8f1f986495ff3750ad8 +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh d3df0465db00cf4ed9f90d0bfc3b827d32b9c796 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 3ac6b716f787f53a3ace49866b7b8d93a817ed74 +mfd 271bb1773b1eeff6153f1bba16ff0cff23f064b6 +backlight 9d6c243502b7f0a9696bc6fe5b473e40d8478d28 +battery 0fe69b960ae208e7f3c824226fa21712942f3f2f +omap_dss2 08bfb453f0458dd353f37737d80475ff13868d9c +regulator d2a2e729a666972d1938e63e804ee5bb6ea13549 +security ba94c3ff20c9c179f2a80f0e4c71e1571ebbf5c7 +integrity 72e1eed8abb11c79749266d433c817ce36732893 +selinux 63205654c0e05e5ffa1c6eef2fbef21dcabd2185 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog 760d280084f8805e5de73e3591912d5db9da9dbe +iommu b67ad2f7c7514f94fe6bbd0cd86add445eb4e64a +dwmw2-iommu 0bdec95ce52d2705787f813e82c1ff2f1b29af17 +vfio 222e684ca762e9288108fcf852eb5d08cbe10ae3 +jc_docs 91633a6dc7cb49ae7c3d268e183ddc905e739fff +trivial 75021d28594d9b6fb4d05bbc41f77948a0db0e02 +audit a4416687e957d034503f887eb52e9c7111d0093e +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh b1d06b60e90cd5016798b9984f8e420e753f4846 +mailbox cb1ca0b3bb6681310e7fe9d29d6d4c76dd71801d +spi f268d4526964a48a17ba9b80a12a60460e1f588d +tip 5a5b01e59771cefe22a210913366db76cd0ff810 +clockevents 53c573ecc2dc7ff8751f7c004a7fe61e40f15cc3 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 990995bad13c2bcf074f87236d1a6c5e09bd5eff +irqchip 8005c49d9aea74d382f474ce11afbbc7d7130bec +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace e428abbbf616cd8fdd1162e4a624ad1d47b47544 +rcu b8f42236b06a63e9b65d293555e7611702fa6c23 +kvm f6d07dfcb15aad199d7351d3122eabd506968daf +kvm-arm 26caea7693cb99833fe4ecc544c842289d6b3f69 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus a3eaa8649e4c6a6afdafaa04b9114fb230617bb1 +kvms390 46b708ea875f14f5496109df053624199f3aae87 +xen-tip abed7d0710e8f892c267932a9492ccf447674fb8 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 4fcfc30131440b5e2c533fbdf34df7cfb360c4cb +drivers-x86 b82983401684ba06fcf3fbafa63edf371c0d4775 +chrome-platform ebaf31c46cce0dc8a6ed690b5456b295aa7586a6 +regmap 760d93aa02582cb17c7c6f287172ff87127f87a0 +hsi 16bd5865cdb3b190105db21bd22a0ca0501e7b20 +leds 44809853d5d4184f4578d56c59582f7cfacf8446 +ipmi d503e2fbbfea88c28dcb7a097dcb9aa6a92a69d9 +driver-core 8005c49d9aea74d382f474ce11afbbc7d7130bec +tty 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb-gadget 8005c49d9aea74d382f474ce11afbbc7d7130bec +usb-serial d0bf1ff0ae322aca59b00b9a2ad121d35a77e78f +usb-chipidea-next 2fb2884ed856fb320bfb7928f462684bec77a105 +staging 4811789503d16510a8a6610fb6c4097e1efa6312 +char-misc 8005c49d9aea74d382f474ce11afbbc7d7130bec +extcon 8005c49d9aea74d382f474ce11afbbc7d7130bec +cgroup 6c2920926b10e8303378408e3c2b8952071d4344 +scsi 0a5149ba02bdf75281b8bc94cf6dfa94c527fa6f +target-updates 517982229f78b2aebf00a8a337e84e8eeea70b8e +target-merge bc0195aad0daa2ad5b0d76cce22b167bc3435590 +pinctrl d99c8053fc2473115f506782822cb7c33c687513 +vhost d629f2b585cb766ed9732008976d029cb5d5e584 +remoteproc 8de3dbd0895bebe52d069a82feae8e3fb51c1bdf +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio 0963670aeaec2287aa263daa0d41384d4dcd5292 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 5dcd7b42f1d06c62b5589441e69cc77c26c8b725 +dma-buf 86ea07ca846a7c352f39dd0b7d81f15f403c7db8 +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk e5bf1991ea62b4f4fc906d0828f7eed988fc3835 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 3b5bab390181968e403886a45c70f9c13b5b6d29 +y2038 8750343a6505287e6af3388262e2da87c3f11acb +luto-misc a6c5170d1edea97c538c81e377e56c7b5c5b7e63 +borntraeger fc7f9754db6ce0c12281da4055281f731d36bdee +livepatching 2184037e40ce3807df83a47b43a7f1674ee3027b +coresight a0aede15d4962b384b968f87b1f9ec9eb98f9152 +rtc 1e3929ef0e1c4c7127b785ce7a236965b3739406 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 8de5dff8bae634497f4413bc3067389f2ed267da +akpm-current dcbefa17259c026e13990b06c3e884202b4ffc75 +akpm a0bab9bf631ead38ba92ab1183da77bd9c15c840 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..c72d5d151a04 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,233 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://codeaurora.org/quic/kernel/agross-msm.git#qcom/for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..698572db7377 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2152 @@ +$ date -R +Tue, 17 Nov 2015 09:29:00 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0ca9b67606f0 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (8005c49d9aea Linux 4.4-rc1) +$ git merge origin/master +Updating 0ca9b67606f0..8005c49d9aea +Fast-forward + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging fixes/master (25cb62b76430 Linux 4.3-rc5) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (1451ad03fac3 powerpc: Wire up sys_mlock2()) +$ git merge powerpc-fixes/fixes +Updating 8005c49d9aea..1451ad03fac3 +Fast-forward + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (2c302e7e4105 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (f1a454a37618 ipg: Remove ipg driver) +$ git merge net/master +Removing drivers/net/ethernet/icplus/ipg.h +Removing drivers/net/ethernet/icplus/ipg.c +Removing drivers/net/ethernet/icplus/Makefile +Removing drivers/net/ethernet/icplus/Kconfig +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 - + arch/arm/net/bpf_jit_32.c | 2 +- + arch/arm64/net/bpf_jit_comp.c | 8 +- + drivers/net/dsa/mv88e6060.c | 114 +- + drivers/net/dsa/mv88e6060.h | 111 + + drivers/net/ethernet/Kconfig | 1 - + drivers/net/ethernet/Makefile | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 10 +- + drivers/net/ethernet/dlink/Kconfig | 5 +- + drivers/net/ethernet/dlink/dl2k.c | 55 +- + drivers/net/ethernet/dlink/dl2k.h | 15 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 19 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/icplus/Kconfig | 13 - + drivers/net/ethernet/icplus/Makefile | 5 - + drivers/net/ethernet/icplus/ipg.c | 2300 -------------------- + drivers/net/ethernet/icplus/ipg.h | 748 ------- + drivers/net/ethernet/mellanox/mlx4/main.c | 8 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 50 + + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 76 +- + drivers/net/ethernet/realtek/r8169.c | 6 +- + drivers/net/ethernet/renesas/ravb_main.c | 8 +- + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/smsc/smsc911x.c | 17 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 10 +- + drivers/net/fjes/fjes_hw.c | 2 +- + drivers/net/phy/at803x.c | 4 + + drivers/net/phy/vitesse.c | 16 +- + drivers/net/usb/cdc_ether.c | 5 + + drivers/net/vmxnet3/vmxnet3_drv.c | 7 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + include/linux/mlx5/mlx5_ifc.h | 24 +- + include/linux/netdevice.h | 27 +- + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/linux/netfilter_ingress.h | 13 +- + include/net/ip6_fib.h | 3 +- + include/net/ip6_tunnel.h | 3 +- + include/net/ip_tunnels.h | 3 +- + include/net/netfilter/nf_tables.h | 16 +- + include/net/sock.h | 25 + + include/net/switchdev.h | 2 +- + net/bridge/br_stp.c | 2 +- + net/bridge/br_stp_if.c | 2 +- + net/core/dev.c | 17 +- + net/ipv4/inet_connection_sock.c | 4 +- + net/ipv4/netfilter/nf_nat_pptp.c | 2 +- + net/ipv4/raw.c | 8 +- + net/ipv4/tcp.c | 21 +- + net/ipv4/tcp_diag.c | 2 +- + net/ipv4/tcp_ipv4.c | 14 +- + net/ipv6/mcast.c | 2 - + net/ipv6/route.c | 22 +- + net/ipv6/tcp_ipv6.c | 19 +- + net/netfilter/Kconfig | 6 +- + net/netfilter/ipset/ip_set_bitmap_gen.h | 17 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 14 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 64 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 18 +- + net/netfilter/ipset/ip_set_core.c | 14 +- + net/netfilter/ipset/ip_set_hash_gen.h | 26 +- + net/netfilter/ipset/ip_set_list_set.c | 5 +- + net/netfilter/ipvs/ip_vs_core.c | 16 +- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nft_counter.c | 49 +- + net/netfilter/nft_dynset.c | 5 +- + net/packet/af_packet.c | 86 +- + net/sctp/auth.c | 4 +- + net/unix/af_unix.c | 19 + + samples/bpf/Makefile | 7 +- + tools/net/Makefile | 7 +- + 74 files changed, 785 insertions(+), 3491 deletions(-) + create mode 100644 drivers/net/dsa/mv88e6060.h + delete mode 100644 drivers/net/ethernet/icplus/Kconfig + delete mode 100644 drivers/net/ethernet/icplus/Makefile + delete mode 100644 drivers/net/ethernet/icplus/ipg.c + delete mode 100644 drivers/net/ethernet/icplus/ipg.h +Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/xfrm4_policy.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_policy.c | 46 +++++++++++++++++++++++++++++++++--------- + net/ipv6/xfrm6_policy.c | 53 +++++++++++++++++++++++++++++++++++-------------- + net/xfrm/xfrm_policy.c | 38 ----------------------------------- + 3 files changed, 75 insertions(+), 62 deletions(-) +Merging ipvs/master (086f332167d6 netfilter: nf_tables: add clone interface to expression operations) +$ git merge ipvs/master +Already up-to-date. +Merging sound-current/for-linus (a91e627e3f0e ALSA: usb-audio: work around CH345 input SysEx corruption) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/dice/dice.c | 4 ++++ + sound/pci/hda/patch_realtek.c | 1 + + sound/usb/midi.c | 46 +++++++++++++++++++++++++++++++++++++++++++ + sound/usb/quirks-table.h | 11 +++++++++++ + sound/usb/quirks.c | 1 + + sound/usb/usbaudio.h | 1 + + 6 files changed, 64 insertions(+) +Merging pci-current/for-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-drivers/master (761d4be5cf66 drivers: net: xgene: fix RGMII 10/100Mb mode) +$ git merge wireless-drivers/master +Already up-to-date. +Merging driver-core.current/driver-core-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (8005c49d9aea Linux 4.4-rc1) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (59536da34513 USB: qcserial: Fix support for HP lt4112 LTE/HSPA+ Gobi 4G Modem) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 2 + + drivers/usb/serial/qcserial.c | 94 +++++++++++++++++++++++++++-------- + drivers/usb/serial/ti_usb_3410_5052.c | 2 + + drivers/usb/serial/ti_usb_3410_5052.h | 4 ++ + 4 files changed, 82 insertions(+), 20 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx27.dtsi | 16 +++-- + drivers/usb/chipidea/ci_hdrc_imx.c | 131 ++++++++++++++++++++++++++++++++----- + drivers/usb/chipidea/debug.c | 2 + + drivers/usb/chipidea/udc.c | 17 +++++ + 4 files changed, 144 insertions(+), 22 deletions(-) +Merging staging.current/staging-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (bbdb5c22e125 Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (176155dac13f crypto: qat - don't use userspace pointer) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (fd0fe6acf1dd drm/i915: get runtime PM reference around GEM set_caching IOCTL) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem.c | 8 +++++++- + drivers/gpu/drm/i915/intel_display.c | 9 +++++++-- + drivers/gpu/drm/i915/intel_pm.c | 8 +++++--- + 3 files changed, 19 insertions(+), 6 deletions(-) +Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (b8628f3fe41c ARCv2: Use the default irq priority for idle sleep) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/configs/axs101_defconfig | 2 +- + arch/arc/configs/axs103_defconfig | 2 +- + arch/arc/configs/axs103_smp_defconfig | 2 +- + arch/arc/configs/nsim_hs_defconfig | 2 +- + arch/arc/configs/nsim_hs_smp_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- + arch/arc/configs/vdk_hs38_defconfig | 2 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- + arch/arc/include/asm/irqflags-arcv2.h | 3 +++ + arch/arc/include/asm/irqflags-compact.h | 2 ++ + arch/arc/kernel/process.c | 9 ++++----- + arch/arc/mm/tlb.c | 4 ++-- + 13 files changed, 20 insertions(+), 16 deletions(-) +Merging arm/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge arm/for-next +Already up-to-date. +Merging arm-perf/for-next/perf (8005c49d9aea Linux 4.4-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (62212c08e1f0 Merge branch 'next/cleanup' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-pxa/palm27x.c | 2 +- + arch/arm/mach-pxa/palmtc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/mach-at91/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/mach-at91/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + arch/arm/mach-berlin/Kconfig | 3 --- + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 ++++++++++++++++++++++ + 2 files changed, 22 insertions(+), 3 deletions(-) +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + drivers/soc/ti/knav_qmss_queue.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging mvebu/for-next (2a9e275d2fbf Merge branch 'mvebu/config' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f66b2dd899c] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/qcom/for-next (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/qcom/for-next +Resolved 'drivers/soc/qcom/Kconfig' using previous resolution. +Resolved 'drivers/soc/qcom/smd-rpm.c' using previous resolution. +Auto-merging include/linux/qcom_scm.h +Auto-merging drivers/soc/qcom/smd-rpm.c +CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c +Auto-merging drivers/soc/qcom/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig +Auto-merging drivers/firmware/qcom_scm-32.c +Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 517f67464c79] Merge remote-tracking branch 'qcom/qcom/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + drivers/firmware/qcom_scm-32.c | 82 +++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + include/linux/qcom_scm.h | 6 + + 7 files changed, 424 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next) +$ git merge rockchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (f189f9be0d4d Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 406 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5410.dtsi | 36 ++ + drivers/pinctrl/samsung/pinctrl-exynos.c | 103 ++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 6 files changed, 549 insertions(+) + create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi +Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (cd48d86d7f3c Merge branch for-4.5/dt into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/nvidia,tegra210-car.txt | 56 + + arch/arm/mach-tegra/Kconfig | 50 - + arch/arm64/Kconfig.platforms | 12 - + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/nvidia/Makefile | 7 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1130 ++++++++ + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 990 +++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 45 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 50 + + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 1302 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 1272 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1270 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 805 ++++++ + drivers/amba/Kconfig | 2 +- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-id.h | 75 +- + drivers/clk/tegra/clk-pll.c | 749 ++++- + drivers/clk/tegra/clk-tegra-periph.c | 371 ++- + drivers/clk/tegra/clk-tegra-super-gen4.c | 142 +- + drivers/clk/tegra/clk-tegra114.c | 24 +- + drivers/clk/tegra/clk-tegra124.c | 24 +- + drivers/clk/tegra/clk-tegra20.c | 18 +- + drivers/clk/tegra/clk-tegra210.c | 2847 ++++++++++++++++++++ + drivers/clk/tegra/clk-tegra30.c | 24 +- + drivers/clk/tegra/clk.h | 99 +- + drivers/mmc/host/sdhci-tegra.c | 23 +- + drivers/soc/Kconfig | 1 + + drivers/soc/tegra/Kconfig | 87 + + include/dt-bindings/clock/tegra210-car.h | 401 +++ + 31 files changed, 11633 insertions(+), 263 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt + create mode 100644 arch/arm64/boot/dts/nvidia/Makefile + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210.dtsi + create mode 100644 drivers/clk/tegra/clk-tegra210.c + create mode 100644 drivers/soc/tegra/Kconfig + create mode 100644 include/dt-bindings/clock/tegra210-car.h +Merging arm64/for-next/core (01b305a23494 arm64: suspend: make hw_breakpoint_restore static) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Removing arch/c6x/include/asm/clkdev.h +Auto-merging arch/c6x/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/clkdev.h | 22 ---------------------- + 2 files changed, 1 insertion(+), 22 deletions(-) + delete mode 100644 arch/c6x/include/asm/clkdev.h +Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time()) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. +Merging h8300/h8300-next (2a9c83986221 h8300: zImage alignment fix) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/boot/compressed/vmlinux.lds | 1 + + 1 file changed, 1 insertion(+) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f23d0e2468bc MAINTAINERS: Change Meta arch port status to Odd Fixes) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (4b58ce41dcd3 Merge branch '4.4-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/include/asm/page.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging nios2/for-next (bb3fc5ddef93 nios2: Remove unnecessary #ifdef guards) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (8005c49d9aea Linux 4.4-rc1) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (8509e2d6612d s390/dump: cleanup CPU save area handling) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/s390/zfcpdump.txt | 22 +- + arch/s390/include/asm/cio.h | 1 + + arch/s390/include/asm/elf.h | 2 - + arch/s390/include/asm/fpu/internal.h | 10 +- + arch/s390/include/asm/ipl.h | 17 +- + arch/s390/include/asm/lowcore.h | 21 -- + arch/s390/include/asm/os_info.h | 2 +- + arch/s390/include/asm/pci_dma.h | 4 +- + arch/s390/include/asm/reset.h | 3 +- + arch/s390/include/asm/sclp.h | 3 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/trace/diag.h | 6 +- + arch/s390/include/uapi/asm/unistd.h | 16 +- + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/crash_dump.c | 454 ++++++++++++++------------------ + arch/s390/kernel/diag.c | 4 +- + arch/s390/kernel/early.c | 9 + + arch/s390/kernel/head.S | 8 +- + arch/s390/kernel/ipl.c | 82 +++--- + arch/s390/kernel/machine_kexec.c | 110 ++++---- + arch/s390/kernel/os_info.c | 7 +- + arch/s390/kernel/reipl.S | 94 ++++--- + arch/s390/kernel/sclp.c | 2 +- + arch/s390/kernel/setup.c | 17 +- + arch/s390/kernel/smp.c | 143 +++++----- + arch/s390/kernel/trace.c | 6 +- + arch/s390/kvm/kvm-s390.c | 30 +-- + arch/s390/pci/pci_dma.c | 84 ++++-- + drivers/iommu/s390-iommu.c | 23 +- + drivers/s390/char/Makefile | 4 +- + drivers/s390/char/zcore.c | 461 ++++----------------------------- + drivers/s390/cio/chsc.c | 37 ++- + drivers/s390/cio/chsc.h | 15 ++ + drivers/s390/cio/cio.c | 16 +- + drivers/s390/cio/css.c | 5 - + drivers/s390/crypto/Makefile | 7 +- + drivers/s390/crypto/ap_bus.c | 6 + + drivers/s390/crypto/zcrypt_api.c | 10 +- + drivers/s390/crypto/zcrypt_api.h | 1 + + drivers/s390/crypto/zcrypt_msgtype50.c | 1 + + drivers/s390/crypto/zcrypt_msgtype6.c | 3 + + 41 files changed, 703 insertions(+), 1047 deletions(-) +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 1 + + arch/tile/include/asm/insn.h | 59 +++++++++++++++++++++++++++ + arch/tile/include/asm/jump_label.h | 58 +++++++++++++++++++++++++++ + arch/tile/include/asm/page.h | 10 +++++ + arch/tile/include/asm/processor.h | 2 +- + arch/tile/include/asm/thread_info.h | 8 +++- + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 +----- + arch/tile/kernel/intvec_32.S | 46 +++++++-------------- + arch/tile/kernel/intvec_64.S | 49 +++++++---------------- + arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++ + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +- + arch/tile/kernel/process.c | 79 +++++++++++++++++++------------------ + arch/tile/kernel/time.c | 1 + + 15 files changed, 276 insertions(+), 121 deletions(-) + create mode 100644 arch/tile/include/asm/insn.h + create mode 100644 arch/tile/include/asm/jump_label.h + create mode 100644 arch/tile/kernel/jump_label.c +Merging uml/linux-next (2eb5f31bc4ea um: Switch clocksource to hrtimers) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (e7da2f463700 [SMB3] update signing code) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 8 +++- + fs/cifs/cifsproto.h | 5 ++- + fs/cifs/connect.c | 2 +- + fs/cifs/misc.c | 2 +- + fs/cifs/smb2misc.c | 36 ++++++++++++++--- + fs/cifs/smb2ops.c | 13 ++++-- + fs/cifs/smb2pdu.c | 10 ++--- + fs/cifs/smb2pdu.h | 8 ++-- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 102 +++++++++++++++++++++++++++++++++++++++++++++--- + 10 files changed, 156 insertions(+), 33 deletions(-) +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (be69e1c19f0e fs/ext4: remove unnecessary new_valid_dev check) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (12b76f3bf336 Merge tag 'sound-fix-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 2 ++ + fs/fuse/file.c | 75 +++++++++++++++++++++++++++++++++++++++++------ + fs/fuse/fuse_i.h | 3 ++ + include/uapi/linux/fuse.h | 17 ++++++++++- + 4 files changed, 87 insertions(+), 10 deletions(-) +Merging gfs2/for-next (8f090dc672e4 gfs2: Extended attribute readahead optimization) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/xattr.c +Merge made by the 'recursive' strategy. + fs/gfs2/dir.c | 15 +++++++--- + fs/gfs2/file.c | 4 +-- + fs/gfs2/glock.c | 4 +-- + fs/gfs2/incore.h | 1 + + fs/gfs2/inode.c | 5 ++++ + fs/gfs2/meta_io.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/super.c | 1 + + fs/gfs2/xattr.c | 10 +++---- + 12 files changed, 106 insertions(+), 25 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (941c3ff3102c Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ee8e8bf3b78e nfsd: don't hold i_mutex over userspace upcalls) +$ git merge nfsd/nfsd-next +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4xdr.c | 8 +++--- + fs/nfsd/vfs.c | 23 +++++++--------- + include/linux/namei.h | 1 + + 5 files changed, 89 insertions(+), 19 deletions(-) +Merging orangefs/for-next (555fa0fa618b fs: out of bounds on stack in iov_iter_advance) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 137 +++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 142 +++ + fs/orangefs/devpvfs2-req.c | 984 +++++++++++++++ + fs/orangefs/dir.c | 373 ++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 712 +++++++++++ + fs/orangefs/inode.c | 466 ++++++++ + fs/orangefs/namei.c | 446 +++++++ + fs/orangefs/protocol.h | 443 +++++++ + fs/orangefs/pvfs2-bufmap.c | 558 +++++++++ + fs/orangefs/pvfs2-bufmap.h | 62 + + fs/orangefs/pvfs2-cache.c | 246 ++++ + fs/orangefs/pvfs2-debug.h | 292 +++++ + fs/orangefs/pvfs2-debugfs.c | 458 +++++++ + fs/orangefs/pvfs2-debugfs.h | 3 + + fs/orangefs/pvfs2-dev-proto.h | 85 ++ + fs/orangefs/pvfs2-kernel.h | 819 +++++++++++++ + fs/orangefs/pvfs2-mod.c | 315 +++++ + fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/pvfs2-sysfs.h | 2 + + fs/orangefs/pvfs2-utils.c | 1156 ++++++++++++++++++ + fs/orangefs/super.c | 541 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 529 ++++++++ + fs/orangefs/xattr.c | 530 +++++++++ + 32 files changed, 11776 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devpvfs2-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/pvfs2-bufmap.c + create mode 100644 fs/orangefs/pvfs2-bufmap.h + create mode 100644 fs/orangefs/pvfs2-cache.c + create mode 100644 fs/orangefs/pvfs2-debug.h + create mode 100644 fs/orangefs/pvfs2-debugfs.c + create mode 100644 fs/orangefs/pvfs2-debugfs.h + create mode 100644 fs/orangefs/pvfs2-dev-proto.h + create mode 100644 fs/orangefs/pvfs2-kernel.h + create mode 100644 fs/orangefs/pvfs2-mod.c + create mode 100644 fs/orangefs/pvfs2-sysfs.c + create mode 100644 fs/orangefs/pvfs2-sysfs.h + create mode 100644 fs/orangefs/pvfs2-utils.c + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +Merging overlayfs/overlayfs-next (257f87199347 ovl: move super block magic number to magic.h) +$ git merge overlayfs/overlayfs-next +Auto-merging include/uapi/linux/magic.h +Auto-merging fs/overlayfs/super.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 ++++++++++++++++++++++++++--------------- + fs/overlayfs/inode.c | 23 +++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/super.c | 30 ++++++++++++++++++++++++++++-- + include/uapi/linux/magic.h | 1 + + 5 files changed, 81 insertions(+), 17 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (3053600ed4f7 9p: trans_fd, bail out if recv fcall if missing) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. + net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------ + net/9p/trans_virtio.c | 2 +- + 2 files changed, 47 insertions(+), 43 deletions(-) +Merging ubifs/linux-next (8c1c5f263833 ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (4e14e49a91e1 Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (95ace75414f3 locks: Don't allow mounts in user namespaces to enable mandatory locking) +$ git merge file-locks/linux-next +Auto-merging fs/Kconfig +Merge made by the 'recursive' strategy. + fs/Kconfig | 10 ++++++++ + fs/locks.c | 2 ++ + fs/namespace.c | 10 ++++++++ + include/linux/fs.h | 74 +++++++++++++++++++++++++++++------------------------- + 4 files changed, 62 insertions(+), 34 deletions(-) +Merging vfs/for-next (1a487dec990b f2fs: xattr simplifications) +$ git merge vfs/for-next +Resolved 'fs/xfs/xfs_xattr.c' using previous resolution. +Auto-merging fs/xfs/xfs_xattr.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_xattr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 835f8c7ee603] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging pci/next (8005c49d9aea Linux 4.4-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (b516a293d7eb Merge branch 'for-4.4/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/wacom_wac.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. +Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. +Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (18ed6787d9fd hwmon: (pmbus) Add client driver for LTC3815) +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/htu21.c +Removing Documentation/hwmon/htu21 +Merge made by the 'recursive' strategy. + Documentation/hwmon/htu21 | 46 --------- + Documentation/hwmon/ltc3815 | 61 ++++++++++++ + drivers/hwmon/Kconfig | 12 +-- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/htu21.c | 174 ---------------------------------- + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc3815.c | 215 ++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/scpi-hwmon.c | 21 +++-- + 10 files changed, 301 insertions(+), 242 deletions(-) + delete mode 100644 Documentation/hwmon/htu21 + create mode 100644 Documentation/hwmon/ltc3815 + delete mode 100644 drivers/hwmon/htu21.c + create mode 100644 drivers/hwmon/pmbus/ltc3815.c +Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (674327f76bb1 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'scripts/Makefile.modpost' using previous resolution. +Auto-merging scripts/Makefile.modpost +CONFLICT (content): Merge conflict in scripts/Makefile.modpost +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3be672378940] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (fca9051bec79 Merge branch 'for-4.4' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (f751cc4a8d65 Merge branches 'acpi-smbus' and 'acpi-ec' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/msr-index.h | 3 +- + drivers/acpi/cppc_acpi.c | 2 +- + drivers/acpi/ec.c | 2 +- + drivers/acpi/sbshc.c | 48 +++----------- + drivers/base/power/wakeirq.c | 6 ++ + drivers/cpufreq/Kconfig.arm | 1 + + drivers/cpufreq/cppc_cpufreq.c | 1 + + drivers/cpufreq/intel_pstate.c | 114 ++++++++++++++++++++++------------ + tools/power/x86/turbostat/turbostat.c | 8 +-- + 9 files changed, 96 insertions(+), 89 deletions(-) +Merging idle/next (fa16ab4806c1 x86: remove unused definition of MSR_NHM_PLATFORM_INFO) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (7c5b2759bf8c Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (84f0e490bee0 thermal: rcar_thermal: remove redundant operation) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/rockchip-thermal.txt | 4 +- + drivers/thermal/of-thermal.c | 2 +- + drivers/thermal/power_allocator.c | 24 +- + drivers/thermal/rcar_thermal.c | 49 ++- + drivers/thermal/rockchip_thermal.c | 328 +++++++++++++++------ + 5 files changed, 272 insertions(+), 135 deletions(-) +Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (14d34dad30f6 Merge branch 'topic/rcar' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 13 +- + .../devicetree/bindings/dma/stm32-dma.txt | 82 ++ + Documentation/dmaengine/client.txt | 38 +- + Documentation/dmaengine/provider.txt | 20 +- + arch/arm/configs/stm32_defconfig | 2 + + drivers/dca/dca-core.c | 3 +- + drivers/dma/Kconfig | 12 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 20 +- + drivers/dma/at_hdmac_regs.h | 6 +- + drivers/dma/at_xdmac.c | 20 +- + drivers/dma/dma-axi-dmac.c | 8 + + drivers/dma/dmaengine.c | 6 +- + drivers/dma/edma.c | 4 +- + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/ioat/dca.c | 2 +- + drivers/dma/ioat/dma.h | 34 +- + drivers/dma/ioat/registers.h | 16 +- + drivers/dma/pxa_dma.c | 1 + + drivers/dma/sh/usb-dmac.c | 11 +- + drivers/dma/stm32-dma.c | 1141 ++++++++++++++++++++ + drivers/dma/virt-dma.c | 46 +- + drivers/dma/virt-dma.h | 25 + + include/linux/dca.h | 5 +- + include/linux/dmaengine.h | 92 ++ + include/linux/of_dma.h | 2 +- + sound/core/pcm_dmaengine.c | 9 +- + 27 files changed, 1524 insertions(+), 97 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/stm32-dma.txt + create mode 100644 drivers/dma/stm32-dma.c +Merging net-next/master (c5a37883f42b Merge branch 'akpm' (patches from Andrew)) +$ git merge net-next/master +Already up-to-date. +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (c5a37883f42b Merge branch 'akpm' (patches from Andrew)) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (fa8384d37f99 Bluetooth: Delete an unnecessary check before the function call "kfree_skb") +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/bfusb.c | 9 +- + drivers/bluetooth/bluecard_cs.c | 25 +- + drivers/bluetooth/bpa10x.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 11 +- + drivers/bluetooth/btmrvl_main.c | 8 +- + drivers/bluetooth/btmrvl_sdio.c | 4 +- + drivers/bluetooth/btsdio.c | 6 +- + drivers/bluetooth/btuart_cs.c | 11 +- + drivers/bluetooth/btusb.c | 48 +-- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/dtl1_cs.c | 11 +- + drivers/bluetooth/hci_ath.c | 6 +- + drivers/bluetooth/hci_bcm.c | 2 +- + drivers/bluetooth/hci_bcsp.c | 25 +- + drivers/bluetooth/hci_h4.c | 16 +- + drivers/bluetooth/hci_h5.c | 14 +- + drivers/bluetooth/hci_intel.c | 14 +- + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/bluetooth/hci_ll.c | 4 +- + drivers/bluetooth/hci_qca.c | 4 +- + drivers/bluetooth/hci_vhci.c | 8 +- + include/net/bluetooth/bluetooth.h | 25 +- + include/net/bluetooth/hci.h | 3 +- + include/net/bluetooth/hci_core.h | 13 +- + include/net/bluetooth/hci_mon.h | 2 + + include/net/bluetooth/hci_sock.h | 1 + + net/bluetooth/af_bluetooth.c | 8 +- + net/bluetooth/cmtp/core.c | 3 +- + net/bluetooth/hci_conn.c | 103 ++---- + net/bluetooth/hci_core.c | 569 ++++++++------------------------ + net/bluetooth/hci_request.c | 676 ++++++++++++++++++++++++++++++++++++-- + net/bluetooth/hci_request.h | 25 +- + net/bluetooth/hci_sock.c | 200 +++++++++-- + net/bluetooth/l2cap_core.c | 15 +- + net/bluetooth/mgmt.c | 520 ++++++----------------------- + net/mac802154/rx.c | 3 +- + 36 files changed, 1270 insertions(+), 1139 deletions(-) +Merging rdma/for-next (db7489e07669 IB/core, cma: Make __attribute_const__ declarations sparse-friendly) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (9ca641b0f02a mtd: nand: fix shutdown/reboot for multi-chip systems) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/jz4740_nand.c | 1 + + drivers/mtd/nand/nand_base.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging l2-mtd/master (e727ee86d9e5 Merge MTD 4.4 development into MTD -next) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/mtk-quadspi.txt | 41 ++++++++++++++ + .../devicetree/bindings/mtd/partition.txt | 2 + + drivers/mtd/Kconfig | 2 +- + drivers/mtd/afs.c | 63 +++++++++++----------- + drivers/mtd/devices/m25p80.c | 10 ++-- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/devices/spear_smi.c | 6 +-- + drivers/mtd/devices/st_spi_fsm.c | 5 +- + drivers/mtd/maps/lantiq-flash.c | 5 +- + drivers/mtd/maps/physmap_of.c | 6 +-- + drivers/mtd/mtdcore.c | 4 ++ + drivers/mtd/mtdpart.c | 3 +- + drivers/mtd/nand/atmel_nand.c | 7 ++- + drivers/mtd/nand/brcmnand/brcmnand.c | 7 ++- + drivers/mtd/nand/davinci_nand.c | 10 ++-- + drivers/mtd/nand/fsl_elbc_nand.c | 5 +- + drivers/mtd/nand/fsl_ifc_nand.c | 5 +- + drivers/mtd/nand/fsl_upm.c | 5 +- + drivers/mtd/nand/fsmc_nand.c | 9 ++-- + drivers/mtd/nand/gpio.c | 8 ++- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 5 +- + drivers/mtd/nand/hisi504_nand.c | 5 +- + drivers/mtd/nand/lpc32xx_mlc.c | 7 ++- + drivers/mtd/nand/lpc32xx_slc.c | 7 ++- + drivers/mtd/nand/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/mxc_nand.c | 5 +- + drivers/mtd/nand/nand_base.c | 7 ++- + drivers/mtd/nand/ndfc.c | 5 +- + drivers/mtd/nand/omap2.c | 6 +-- + drivers/mtd/nand/orion_nand.c | 6 +-- + drivers/mtd/nand/plat_nand.c | 5 +- + drivers/mtd/nand/pxa3xx_nand.c | 10 ++-- + drivers/mtd/nand/sh_flctl.c | 6 +-- + drivers/mtd/nand/socrates_nand.c | 5 +- + drivers/mtd/nand/sunxi_nand.c | 6 +-- + drivers/mtd/nand/vf610_nfc.c | 14 ++--- + drivers/mtd/ofpart.c | 12 ++--- + drivers/mtd/onenand/omap2.c | 8 ++- + drivers/mtd/spi-nor/fsl-quadspi.c | 6 +-- + drivers/mtd/spi-nor/nxp-spifi.c | 6 +-- + drivers/mtd/spi-nor/spi-nor.c | 2 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 5 +- + include/linux/mtd/mtd.h | 11 ++++ + include/linux/mtd/nand.h | 11 ++++ + include/linux/mtd/partitions.h | 3 -- + include/linux/mtd/spi-nor.h | 13 ++++- + 46 files changed, 206 insertions(+), 183 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mtk-quadspi.txt +Merging crypto/master (79960943fdc1 crypto: talitos - Fix timing leak in ESP ICV verification) +$ git merge crypto/master +Merge made by the 'recursive' strategy. + drivers/crypto/nx/nx-aes-ccm.c | 2 +- + drivers/crypto/nx/nx-aes-gcm.c | 3 ++- + drivers/crypto/talitos.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging drm/drm-next (f20780f3e8fe Merge branch 'drm-sti-next-2015-11-03' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (1f38089cb73a drm/i915: Model PSR AUX register selection more like the normal AUX code) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_guc_loader.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_params.c +Auto-merging 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_dma.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging arch/x86/kernel/early-quirks.c +Auto-merging Documentation/DocBook/gpu.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 12 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 185 +++++- + drivers/gpu/drm/i915/i915_dma.c | 22 +- + drivers/gpu/drm/i915/i915_drv.c | 155 ++--- + drivers/gpu/drm/i915/i915_drv.h | 127 ++-- + drivers/gpu/drm/i915/i915_gem.c | 66 +- + drivers/gpu/drm/i915/i915_gem_context.c | 8 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 7 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 36 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 1 + + drivers/gpu/drm/i915/i915_guc_submission.c | 14 +- + drivers/gpu/drm/i915/i915_irq.c | 85 +-- + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 135 +++-- + drivers/gpu/drm/i915/i915_vgpu.c | 6 +- + drivers/gpu/drm/i915/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 2 + + drivers/gpu/drm/i915/intel_audio.c | 9 +- + drivers/gpu/drm/i915/intel_csr.c | 274 ++++----- + drivers/gpu/drm/i915/intel_ddi.c | 128 ++-- + drivers/gpu/drm/i915/intel_display.c | 611 +++++++++++++------ + drivers/gpu/drm/i915/intel_dp.c | 830 +++++++++++--------------- + drivers/gpu/drm/i915/intel_dp_link_training.c | 323 ++++++++++ + drivers/gpu/drm/i915/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/intel_drv.h | 130 ++-- + drivers/gpu/drm/i915/intel_fbc.c | 196 +++--- + drivers/gpu/drm/i915/intel_fbdev.c | 34 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 125 +++- + drivers/gpu/drm/i915/intel_guc.h | 8 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 72 +++ + drivers/gpu/drm/i915/intel_guc_loader.c | 105 ++-- + drivers/gpu/drm/i915/intel_hdmi.c | 13 +- + drivers/gpu/drm/i915/intel_i2c.c | 4 +- + drivers/gpu/drm/i915/intel_lrc.c | 27 +- + drivers/gpu/drm/i915/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/intel_mocs.c | 2 +- + drivers/gpu/drm/i915/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 620 ++++++++----------- + drivers/gpu/drm/i915/intel_psr.c | 51 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 139 +++-- + drivers/gpu/drm/i915/intel_ringbuffer.h | 2 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 64 +- + drivers/gpu/drm/i915/intel_sdvo.c | 11 + + drivers/gpu/drm/i915/intel_sprite.c | 20 +- + drivers/gpu/drm/i915/intel_uncore.c | 69 ++- + include/drm/i915_component.h | 69 ++- + include/drm/i915_pciids.h | 36 ++ + include/uapi/drm/i915_drm.h | 5 +- + 52 files changed, 2844 insertions(+), 2019 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.c +Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (1c2260589ad8 drm: Describe the Rotation property bits.) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging Documentation/DocBook/gpu.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 48 ++++----------- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 - + drivers/gpu/drm/ast/ast_drv.h | 1 - + drivers/gpu/drm/cirrus/cirrus_drv.h | 1 - + drivers/gpu/drm/drm_atomic.c | 9 +-- + drivers/gpu/drm/drm_atomic_helper.c | 5 +- + drivers/gpu/drm/drm_gem.c | 35 ++++++++++- + drivers/gpu/drm/i915/intel_drv.h | 2 - + drivers/gpu/drm/imx/Kconfig | 9 --- + drivers/gpu/drm/imx/imx-drm-core.c | 12 +--- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 - + drivers/gpu/drm/qxl/qxl_fb.c | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 1 - + drivers/gpu/drm/tegra/Kconfig | 12 ---- + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tegra/drm.h | 6 +- + drivers/gpu/drm/tegra/fb.c | 12 ++-- + drivers/gpu/drm/udl/udl_fb.c | 1 - + drivers/gpu/drm/virtio/virtgpu_fb.c | 1 - + include/drm/drm_crtc.h | 6 +- + include/drm/drm_dp_helper.h | 36 +++++++++++ + include/drm/drm_gem.h | 106 +++++++++++++++++++++++++++----- + 22 files changed, 196 insertions(+), 114 deletions(-) +Merging drm-exynos/exynos-drm/for-next (628aea2df786 drm/exynos: add pm_runtime to DECON 7) +$ git merge drm-exynos/exynos-drm/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 54 ++++++--- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 125 +++++++++---------- + drivers/gpu/drm/exynos/exynos_dp_core.c | 165 +++++++++++++++++++------- + drivers/gpu/drm/exynos/exynos_dp_core.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 91 ++++++-------- + drivers/gpu/drm/exynos/exynos_hdmi.c | 56 ++++++--- + drivers/gpu/drm/exynos/exynos_mixer.c | 125 ++++++++++--------- + 7 files changed, 352 insertions(+), 265 deletions(-) +Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (3c7a09358729 ALSA: ua101: replace le16_to_cpu() with usb_endpoint_maxp()) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/usb/misc/ua101.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging sound-asoc/for-next (3fc80330c3c9 Merge remote-tracking branches 'asoc/topic/wm8962' and 'asoc/topic/wm9713' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 10 + + .../devicetree/bindings/sound/img,i2s-in.txt | 47 + + .../devicetree/bindings/sound/img,i2s-out.txt | 51 + + .../devicetree/bindings/sound/img,parallel-out.txt | 44 + + .../devicetree/bindings/sound/img,spdif-in.txt | 41 + + .../devicetree/bindings/sound/img,spdif-out.txt | 44 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + + .../bindings/sound/renesas,rsrc-card.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 2 + + Documentation/devicetree/bindings/sound/rt5677.txt | 2 +- + Documentation/sound/alsa/img,spdif-in.txt | 49 + + include/sound/soc-dapm.h | 1 + + include/uapi/sound/asoc.h | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 9 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4613.c | 115 +- + sound/soc/codecs/arizona.c | 16 +- + sound/soc/codecs/cs47l24.c | 1148 ++++++++++++++++++++ + sound/soc/codecs/cs47l24.h | 23 + + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/nau8825.c | 31 + + sound/soc/codecs/rl6231.c | 6 +- + sound/soc/codecs/rt298.c | 2 - + sound/soc/codecs/rt5645.c | 254 ++++- + sound/soc/codecs/rt5677.c | 108 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/codecs/wm8998.c | 46 +- + sound/soc/codecs/wm9713.c | 296 ++--- + sound/soc/davinci/davinci-mcasp.c | 4 +- + sound/soc/fsl/fsl_esai.c | 44 +- + sound/soc/fsl/fsl_sai.c | 23 +- + sound/soc/fsl/fsl_spdif.c | 16 +- + sound/soc/fsl/fsl_ssi.c | 22 +- + sound/soc/img/Kconfig | 44 + + sound/soc/img/Makefile | 5 + + sound/soc/img/img-i2s-in.c | 516 +++++++++ + sound/soc/img/img-i2s-out.c | 565 ++++++++++ + sound/soc/img/img-parallel-out.c | 327 ++++++ + sound/soc/img/img-spdif-in.c | 806 ++++++++++++++ + sound/soc/img/img-spdif-out.c | 441 ++++++++ + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/atom/sst/sst_acpi.c | 67 +- + sound/soc/intel/boards/skl_rt286.c | 5 +- + sound/soc/intel/common/Makefile | 3 +- + sound/soc/intel/common/sst-acpi.c | 41 +- + sound/soc/intel/common/sst-acpi.h | 33 + + sound/soc/intel/common/sst-dsp-priv.h | 8 +- + sound/soc/intel/common/sst-firmware.c | 4 +- + sound/soc/intel/common/sst-match-acpi.c | 43 + + sound/soc/intel/haswell/sst-haswell-dsp.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 191 ++-- + sound/soc/intel/skylake/skl-nhlt.c | 19 +- + sound/soc/intel/skylake/skl-pcm.c | 142 +-- + sound/soc/intel/skylake/skl-sst-dsp.h | 3 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst.c | 12 +- + sound/soc/intel/skylake/skl-topology.c | 389 +++---- + sound/soc/intel/skylake/skl-topology.h | 35 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 90 +- + sound/soc/intel/skylake/skl.c | 119 +- + sound/soc/intel/skylake/skl.h | 4 +- + sound/soc/rockchip/rockchip_i2s.c | 43 +- + sound/soc/rockchip/rockchip_max98090.c | 6 + + sound/soc/rockchip/rockchip_rt5645.c | 6 + + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/sh/Kconfig | 1 - + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/adg.c | 23 +- + sound/soc/sh/rcar/cmd.c | 173 +++ + sound/soc/sh/rcar/core.c | 162 +-- + sound/soc/sh/rcar/ctu.c | 8 + + sound/soc/sh/rcar/dma.c | 240 ++-- + sound/soc/sh/rcar/dvc.c | 159 +-- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sh/rcar/mix.c | 55 +- + sound/soc/sh/rcar/rsnd.h | 90 +- + sound/soc/sh/rcar/src.c | 186 +--- + sound/soc/sh/rcar/ssi.c | 423 ++++---- + sound/soc/sh/rcar/ssiu.c | 181 +++ + sound/soc/soc-dapm.c | 7 + + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 3 +- + sound/soc/soc-topology.c | 1 + + sound/soc/sunxi/sun4i-codec.c | 27 +- + 87 files changed, 6613 insertions(+), 1583 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,parallel-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-out.txt + create mode 100644 Documentation/sound/alsa/img,spdif-in.txt + create mode 100644 sound/soc/codecs/cs47l24.c + create mode 100644 sound/soc/codecs/cs47l24.h + create mode 100644 sound/soc/img/Kconfig + create mode 100644 sound/soc/img/Makefile + create mode 100644 sound/soc/img/img-i2s-in.c + create mode 100644 sound/soc/img/img-i2s-out.c + create mode 100644 sound/soc/img/img-parallel-out.c + create mode 100644 sound/soc/img/img-spdif-in.c + create mode 100644 sound/soc/img/img-spdif-out.c + create mode 100644 sound/soc/intel/common/sst-acpi.h + create mode 100644 sound/soc/intel/common/sst-match-acpi.c + create mode 100644 sound/soc/sh/rcar/cmd.c + create mode 100644 sound/soc/sh/rcar/ssiu.c +Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (5e0baca8b324 Input: parkbd - drop bogus __init from parkbd_allocate_serio()) +$ git merge input/next +Already up-to-date. +Merging block/for-next (4ef4e4105a25 Merge branch 'for-4.4/io-poll' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (b36b8a1fc5db dm thin metadata: speed up discard of partially mapped volumes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-thin-metadata.c | 66 +++++++++++++++++----------- + drivers/md/dm-thin.c | 1 + + drivers/md/persistent-data/dm-btree.c | 81 +++++++++++++++++++++++++++++++++++ + drivers/md/persistent-data/dm-btree.h | 7 +++ + 4 files changed, 130 insertions(+), 25 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (d3df0465db00 mmc: remove bondage between REQ_META and reliable write) +$ git merge mmc-uh/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/mmc/card/block.c | 11 ++---- + drivers/mmc/core/mmc.c | 93 +++++++++++++++++++++++++++++++++++------------ + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/pxamci.c | 2 +- + 6 files changed, 75 insertions(+), 35 deletions(-) +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (3ac6b716f787 md-cluster: Allow spare devices to be marked as faulty) +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md-cluster.c | 17 ++++++++++++++--- + drivers/md/md.c | 22 +++++++++++++--------- + drivers/md/md.h | 1 + + drivers/md/raid5.c | 2 -- + 4 files changed, 28 insertions(+), 14 deletions(-) +Merging mfd/for-mfd-next (271bb1773b1e bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (0fe69b960ae2 power: bq27xxx_battery: Add I2C module check dependency in Kconfig) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (d2a2e729a666 regulator: tps65086: Add regulator driver for the TPS65086 PMIC) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/tps65086-regulator.c | 250 +++++++++++++++++++++++++++++++++ + 3 files changed, 258 insertions(+) + create mode 100644 drivers/regulator/tps65086-regulator.c +Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Already up-to-date. +Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (760d280084f8 watchdog: include: add units for timeout values in kerneldoc) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (222e684ca762 vfio/pci: make an array larger) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (91633a6dc7cb Documentation: Add minimal Mutt config for using Gmail) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging trivial/for-next (75021d28594d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function) +$ git merge audit/next +Merge made by the 'recursive' strategy. +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (b1d06b60e90c of: Provide static inline function for of_translate_address if needed) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (cb1ca0b3bb66 mailbox: mailbox-test: avoid reading iomem twice) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (f268d4526964 Merge remote-tracking branch 'spi/topic/bcm63xx' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi-bcm63xx.c | 11 +++++------ + drivers/spi/spi-mt65xx.c | 26 ++++++++++++++++++-------- + drivers/spi/spi.c | 1 + + 3 files changed, 24 insertions(+), 14 deletions(-) +Merging tip/auto-latest (5a5b01e59771 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/ipi.h | 2 ++ + arch/x86/include/asm/paravirt_types.h | 2 -- + arch/x86/kernel/apic/apic_flat_64.c | 19 +++++-------------- + arch/x86/kernel/apic/apic_noop.c | 2 ++ + arch/x86/kernel/apic/apic_numachip.c | 2 ++ + arch/x86/kernel/apic/bigsmp_32.c | 10 +++------- + arch/x86/kernel/apic/ipi.c | 18 ++++++++++++++++++ + arch/x86/kernel/apic/probe_32.c | 1 + + arch/x86/kernel/apic/x2apic_cluster.c | 9 +++++++++ + arch/x86/kernel/apic/x2apic_phys.c | 9 +++++++++ + arch/x86/kernel/apic/x2apic_uv_x.c | 1 + + arch/x86/kernel/paravirt.c | 13 +------------ + arch/x86/kernel/smp.c | 4 ++-- + 14 files changed, 56 insertions(+), 37 deletions(-) +Merging clockevents/clockevents/next (53c573ecc2dc clocksource/drivers/h8300: Increase the compilation test coverage) +$ git merge clockevents/clockevents/next +Resolved 'arch/h8300/Kconfig' using previous resolution. +Resolved 'arch/h8300/include/asm/io.h' using previous resolution. +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/include/asm/io.h +CONFLICT (content): Merge conflict in arch/h8300/include/asm/io.h +Auto-merging arch/h8300/Kconfig +CONFLICT (content): Merge conflict in arch/h8300/Kconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b773df5fabb7] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 3 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-ux500/Kconfig | 1 + + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/io.h | 39 +++--- + arch/h8300/kernel/setup.c | 8 +- + drivers/clocksource/Kconfig | 131 +++++++++++++----- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/dw_apb_timer_of.c | 16 +++ + drivers/clocksource/h8300_timer16.c | 201 ++++++++++------------------ + drivers/clocksource/h8300_timer8.c | 243 ++++++++++++---------------------- + drivers/clocksource/h8300_tpu.c | 159 ++++++++-------------- + drivers/clocksource/mtk_timer.c | 20 +-- + drivers/clocksource/rockchip_timer.c | 23 ++-- + drivers/clocksource/tegra20_timer.c | 3 +- + drivers/clocksource/vt8500_timer.c | 1 - + drivers/irqchip/irq-renesas-h8300h.c | 8 +- + include/linux/sched_clock.h | 12 +- + 19 files changed, 390 insertions(+), 483 deletions(-) +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (e428abbbf616 tracing: #ifdef out uses of max trace when CONFIG_TRACER_MAX_TRACE is not set) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (b8f42236b06a rcu: Make rcu_gp_init() be bool rather than int) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/2013-08-is-it-dead.png | Bin 0 -> 100825 bytes + .../Design/Requirements/GPpartitionReaders1.svg | 374 +++ + .../RCU/Design/Requirements/RCUApplicability.svg | 237 ++ + .../Design/Requirements/ReadersPartitionGP1.svg | 639 +++++ + .../RCU/Design/Requirements/Requirements.html | 2897 ++++++++++++++++++++ + .../RCU/Design/Requirements/Requirements.htmlx | 2741 ++++++++++++++++++ + Documentation/RCU/Design/htmlqqz.sh | 108 + + Documentation/circular-buffers.txt | 4 +- + include/linux/list.h | 14 +- + include/linux/list_bl.h | 2 +- + include/linux/list_nulls.h | 2 +- + include/linux/rculist.h | 69 +- + include/linux/rcupdate.h | 6 +- + include/linux/rcutiny.h | 8 + + include/linux/rcutree.h | 4 +- + include/linux/tracepoint.h | 4 +- + kernel/rcu/tree.c | 266 +- + kernel/rcu/tree.h | 49 +- + kernel/rcu/tree_plugin.h | 60 +- + kernel/rcu/tree_trace.c | 39 +- + kernel/sched/core.c | 6 +- + lib/list_debug.c | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +- + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 26 files changed, 7305 insertions(+), 257 deletions(-) + create mode 100644 Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png + create mode 100644 Documentation/RCU/Design/Requirements/GPpartitionReaders1.svg + create mode 100644 Documentation/RCU/Design/Requirements/RCUApplicability.svg + create mode 100644 Documentation/RCU/Design/Requirements/ReadersPartitionGP1.svg + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.html + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.htmlx + create mode 100755 Documentation/RCU/Design/htmlqqz.sh +Merging kvm/linux-next (f6d07dfcb15a Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (26caea7693cb KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr()) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (a3eaa8649e4c KVM: VMX: Fix commit which broke PML) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (abed7d0710e8 xen: fix the check of e_pfn in xen_find_pfn_range) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/percpu.h | 2 -- + include/linux/percpu-refcount.h | 2 +- + include/linux/percpu.h | 6 ------ + 3 files changed, 1 insertion(+), 9 deletions(-) +Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (b82983401684 asus-wmi: fix error handling in store_sys_wmi()) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (760d93aa0258 Merge remote-tracking branches 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 - + drivers/base/regmap/regcache-rbtree.c | 9 +++++++-- + drivers/base/regmap/regmap-mmio.c | 16 ++++++++-------- + 11 files changed, 15 insertions(+), 19 deletions(-) +Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (44809853d5d4 leds: ktd2692: Add missing of_node_put) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.txt | 13 +++ + drivers/leds/led-class-flash.c | 6 +- + drivers/leds/led-class.c | 6 +- + drivers/leds/led-core.c | 120 ++++++++++++++++++------- + drivers/leds/leds-88pm860x.c | 23 ++--- + drivers/leds/leds-aat1290.c | 50 +++-------- + drivers/leds/leds-adp5520.c | 26 ++---- + drivers/leds/leds-bd2802.c | 39 +++----- + drivers/leds/leds-blinkm.c | 87 ++++-------------- + drivers/leds/leds-da903x.c | 46 ++++------ + drivers/leds/leds-da9052.c | 39 +++----- + drivers/leds/leds-dac124s085.c | 38 +++----- + drivers/leds/leds-gpio.c | 64 +++++-------- + drivers/leds/leds-ktd2692.c | 50 +++-------- + drivers/leds/leds-lm3533.c | 30 ++----- + drivers/leds/leds-lm355x.c | 85 ++++++------------ + drivers/leds/leds-lm3642.c | 73 +++++---------- + drivers/leds/leds-lp3944.c | 32 ++----- + drivers/leds/leds-lp5521.c | 11 +-- + drivers/leds/leds-lp5523.c | 10 +-- + drivers/leds/leds-lp5562.c | 11 +-- + drivers/leds/leds-lp55xx-common.c | 12 ++- + drivers/leds/leds-lp55xx-common.h | 6 +- + drivers/leds/leds-lp8501.c | 11 +-- + drivers/leds/leds-lp8788.c | 48 +++++----- + drivers/leds/leds-lp8860.c | 27 ++---- + drivers/leds/leds-lt3593.c | 33 +++---- + drivers/leds/leds-max77693.c | 57 ++---------- + drivers/leds/leds-max8997.c | 1 - + drivers/leds/leds-mc13783.c | 35 ++------ + drivers/leds/leds-pca9532.c | 28 +++--- + drivers/leds/leds-pca955x.c | 39 ++------ + drivers/leds/leds-pca963x.c | 80 +++++------------ + drivers/leds/leds-pwm.c | 35 +++----- + drivers/leds/leds-regulator.c | 46 +++------- + drivers/leds/leds-tlc591xx.c | 31 ++----- + drivers/leds/leds-wm831x-status.c | 25 ++---- + drivers/leds/leds-wm8350.c | 64 ++++++------- + drivers/leds/leds.h | 27 +----- + drivers/leds/trigger/ledtrig-backlight.c | 8 +- + drivers/leds/trigger/ledtrig-default-on.c | 2 +- + drivers/leds/trigger/ledtrig-gpio.c | 6 +- + drivers/leds/trigger/ledtrig-heartbeat.c | 4 +- + drivers/leds/trigger/ledtrig-oneshot.c | 6 +- + drivers/leds/trigger/ledtrig-transient.c | 10 +-- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 8 +- + include/linux/leds.h | 27 ++++-- + include/linux/mfd/wm8350/pmic.h | 1 - + 48 files changed, 541 insertions(+), 995 deletions(-) +Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 7 +++- + drivers/char/ipmi/ipmi_si_intf.c | 82 +++++++++++++++++++++++++-------------- + drivers/char/ipmi/ipmi_watchdog.c | 8 +++- + 3 files changed, 64 insertions(+), 33 deletions(-) +Merging driver-core/driver-core-next (8005c49d9aea Linux 4.4-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (8005c49d9aea Linux 4.4-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (8005c49d9aea Linux 4.4-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (8005c49d9aea Linux 4.4-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (d0bf1ff0ae32 USB: cp210x: work around cp2108 GET_LINE_CTL bug) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 128 +++++++++++++++++++++++++++++++++++--------- + 1 file changed, 104 insertions(+), 24 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Removing drivers/usb/chipidea/debug.h +Auto-merging drivers/usb/chipidea/debug.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/Kconfig | 5 ----- + drivers/usb/chipidea/Makefile | 5 +---- + drivers/usb/chipidea/ci.h | 3 +++ + drivers/usb/chipidea/core.c | 1 - + drivers/usb/chipidea/debug.c | 1 - + drivers/usb/chipidea/debug.h | 30 ------------------------------ + drivers/usb/chipidea/udc.c | 28 ++++++++++++++++++++-------- + 7 files changed, 24 insertions(+), 49 deletions(-) + delete mode 100644 drivers/usb/chipidea/debug.h +Merging staging/staging-next (4811789503d1 staging: unisys: visorbus: visorbus_main.c: made checkpatch warning-free) +$ git merge staging/staging-next +Removing drivers/staging/sm750fb/modedb.h +Merge made by the 'recursive' strategy. + drivers/staging/android/ion/compat_ion.c | 6 +- + drivers/staging/android/lowmemorykiller.c | 6 +- + drivers/staging/android/sync.c | 22 +- + drivers/staging/android/timed_gpio.c | 11 +- + drivers/staging/comedi/Kconfig | 12 +- + drivers/staging/comedi/drivers/Makefile | 1 + + drivers/staging/comedi/drivers/adl_pci9118.c | 3 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 109 +- + drivers/staging/comedi/drivers/adv_pci1720.c | 195 ++++ + drivers/staging/comedi/drivers/das16.c | 3 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 18 +- + drivers/staging/dgnc/dgnc_utils.c | 1 - + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/fwserial/fwserial.h | 10 - + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/gdm724x/netlink_k.c | 5 - + drivers/staging/gdm724x/netlink_k.h | 1 - + drivers/staging/gdm72xx/gdm_qos.c | 52 +- + drivers/staging/gdm72xx/gdm_wimax.c | 9 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 154 ++- + .../include/linux/libcfs/libcfs_kernelcomm.h | 2 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 2 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 11 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 3 + + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 - + drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +- + drivers/staging/lustre/lnet/lnet/config.c | 24 +- + drivers/staging/lustre/lnet/lnet/module.c | 2 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +- + drivers/staging/lustre/lnet/selftest/console.c | 88 +- + drivers/staging/lustre/lnet/selftest/framework.c | 8 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 23 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 16 +- + drivers/staging/lustre/lustre/fid/fid_internal.h | 2 - + drivers/staging/lustre/lustre/fid/fid_request.c | 23 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 34 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 9 - + drivers/staging/lustre/lustre/fld/fld_request.c | 2 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 3 - + .../staging/lustre/lustre/include/lustre_disk.h | 1 + + drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 - + drivers/staging/lustre/lustre/include/obd.h | 322 +++--- + drivers/staging/lustre/lustre/include/obd_class.h | 16 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 16 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 47 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 - + drivers/staging/lustre/lustre/libcfs/debug.c | 16 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 2 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 380 ++++--- + .../lustre/lustre/libcfs/kernel_user_comm.c | 3 +- + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 2 - + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +- + .../lustre/libcfs/linux/linux-crypto-adler.c | 9 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 1 - + drivers/staging/lustre/lustre/libcfs/module.c | 6 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 27 +- + drivers/staging/lustre/lustre/libcfs/tracefile.h | 15 - + drivers/staging/lustre/lustre/libcfs/workitem.c | 10 +- + drivers/staging/lustre/lustre/llite/dir.c | 11 +- + .../staging/lustre/lustre/llite/llite_internal.h | 10 - + drivers/staging/lustre/lustre/llite/lloop.c | 2 +- + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 21 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 14 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 94 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 15 - + drivers/staging/lustre/lustre/lov/lov_obd.c | 60 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 16 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 15 - + drivers/staging/lustre/lustre/mdc/mdc_request.c | 116 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 32 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 3 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 6 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 21 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 10 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 - + drivers/staging/lustre/lustre/osc/osc_request.c | 69 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 6 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 3 - + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 3 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 393 ++++--- + drivers/staging/most/aim-network/networking.h | 2 - + drivers/staging/most/hdm-dim2/dim2_errors.h | 2 - + drivers/staging/most/hdm-dim2/dim2_hal.c | 133 +-- + drivers/staging/most/hdm-dim2/dim2_hal.h | 53 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 60 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 5 +- + drivers/staging/most/hdm-dim2/dim2_sysfs.h | 3 - + drivers/staging/most/mostcore/core.c | 3 +- + drivers/staging/most/mostcore/mostcore.h | 2 - + drivers/staging/nvec/README | 2 +- + drivers/staging/nvec/nvec.c | 20 +- + drivers/staging/octeon/ethernet-defines.h | 2 +- + drivers/staging/rdma/amso1100/c2.c | 11 +- + drivers/staging/rdma/amso1100/c2.h | 80 +- + drivers/staging/rdma/amso1100/c2_mq.h | 14 +- + drivers/staging/rdma/amso1100/c2_rnic.c | 5 +- + drivers/staging/rdma/amso1100/c2_vq.h | 20 +- + drivers/staging/rdma/hfi1/chip.c | 71 +- + drivers/staging/rdma/hfi1/chip.h | 1 + + drivers/staging/rdma/hfi1/common.h | 15 +- + drivers/staging/rdma/hfi1/driver.c | 103 +- + drivers/staging/rdma/hfi1/file_ops.c | 178 ++-- + drivers/staging/rdma/hfi1/firmware.c | 2 +- + drivers/staging/rdma/hfi1/hfi.h | 26 - + drivers/staging/rdma/hfi1/init.c | 31 +- + drivers/staging/rdma/hfi1/mad.c | 4 +- + drivers/staging/rdma/hfi1/pcie.c | 32 +- + drivers/staging/rdma/hfi1/pio.c | 19 +- + drivers/staging/rdma/hfi1/qsfp.c | 5 +- + drivers/staging/rdma/hfi1/rc.c | 10 +- + drivers/staging/rdma/hfi1/sdma.c | 40 +- + drivers/staging/rdma/hfi1/uc.c | 15 +- + drivers/staging/rdma/hfi1/user_exp_rcv.h | 74 ++ + drivers/staging/rdma/hfi1/user_sdma.c | 44 +- + drivers/staging/rdma/hfi1/user_sdma.h | 10 +- + drivers/staging/rdma/hfi1/verbs.c | 41 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 100 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 7 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 22 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 84 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 11 +- + drivers/staging/rtl8188eu/hal/fw.c | 40 +- + drivers/staging/rtl8188eu/hal/hal_com.c | 14 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 7 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 34 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- + drivers/staging/rtl8188eu/include/HalVerDef.h | 33 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 6 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 5 +- + drivers/staging/rtl8192u/r8192U_core.c | 15 - + drivers/staging/rtl8192u/r819xU_phy.c | 25 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 8 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 45 +- + drivers/staging/sm750fb/modedb.h | 233 ---- + drivers/staging/sm750fb/sm750.c | 2 - + drivers/staging/unisys/visorbus/visorbus_main.c | 15 +- + drivers/staging/vt6656/key.c | 1 - + drivers/staging/wilc1000/Makefile | 6 +- + drivers/staging/wilc1000/coreconfigurator.c | 1 - + drivers/staging/wilc1000/coreconfigurator.h | 2 +- + drivers/staging/wilc1000/host_interface.c | 1120 ++++++++++---------- + drivers/staging/wilc1000/host_interface.h | 998 +++-------------- + drivers/staging/wilc1000/linux_mon.c | 2 +- + drivers/staging/wilc1000/linux_wlan.c | 622 ++++------- + drivers/staging/wilc1000/linux_wlan_sdio.c | 4 +- + drivers/staging/wilc1000/linux_wlan_sdio.h | 2 +- + drivers/staging/wilc1000/linux_wlan_spi.c | 2 +- + drivers/staging/wilc1000/linux_wlan_spi.h | 2 +- + drivers/staging/wilc1000/wilc_sdio.c | 91 +- + drivers/staging/wilc1000/wilc_spi.c | 164 ++- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 194 ++-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 6 +- + drivers/staging/wilc1000/wilc_wlan.c | 835 +++++---------- + drivers/staging/wilc1000/wilc_wlan.h | 324 +++--- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 2 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 2 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 26 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2mgmt.h | 1 - + drivers/staging/wlan-ng/prism2mib.c | 5 +- + drivers/staging/wlan-ng/prism2sta.c | 21 - + include/uapi/rdma/hfi/hfi1_user.h | 26 +- + 182 files changed, 3666 insertions(+), 5541 deletions(-) + create mode 100644 drivers/staging/comedi/drivers/adv_pci1720.c + create mode 100644 drivers/staging/rdma/hfi1/user_exp_rcv.h + delete mode 100644 drivers/staging/sm750fb/modedb.h +Merging char-misc/char-misc-next (8005c49d9aea Linux 4.4-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (8005c49d9aea Linux 4.4-rc1) +$ git merge extcon/extcon-next +Already up-to-date. +Merging cgroup/for-next (6c2920926b10 cgroup: replace unified-hierarchy.txt with a proper cgroup v2 documentation) +$ git merge cgroup/for-next +Auto-merging include/uapi/linux/magic.h +Removing Documentation/cgroups/unified-hierarchy.txt +Auto-merging Documentation/cgroup-legacy/blkio-controller.txt +Merge made by the 'recursive' strategy. + Documentation/{cgroups => cgroup-legacy}/00-INDEX | 0 + .../blkio-controller.txt | 79 -- + .../{cgroups => cgroup-legacy}/cgroups.txt | 0 + .../{cgroups => cgroup-legacy}/cpuacct.txt | 0 + .../{cgroups => cgroup-legacy}/cpusets.txt | 0 + .../{cgroups => cgroup-legacy}/devices.txt | 0 + .../freezer-subsystem.txt | 0 + .../{cgroups => cgroup-legacy}/hugetlb.txt | 0 + .../{cgroups => cgroup-legacy}/memcg_test.txt | 0 + .../{cgroups => cgroup-legacy}/memory.txt | 0 + .../{cgroups => cgroup-legacy}/net_cls.txt | 0 + .../{cgroups => cgroup-legacy}/net_prio.txt | 0 + Documentation/{cgroups => cgroup-legacy}/pids.txt | 0 + Documentation/cgroup.txt | 1293 ++++++++++++++++++++ + Documentation/cgroups/unified-hierarchy.txt | 647 ---------- + include/linux/cgroup-defs.h | 5 - + include/linux/cgroup.h | 14 +- + include/uapi/linux/magic.h | 1 + + kernel/cgroup.c | 89 +- + 19 files changed, 1352 insertions(+), 776 deletions(-) + rename Documentation/{cgroups => cgroup-legacy}/00-INDEX (100%) + rename Documentation/{cgroups => cgroup-legacy}/blkio-controller.txt (81%) + rename Documentation/{cgroups => cgroup-legacy}/cgroups.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpuacct.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpusets.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/devices.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/freezer-subsystem.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/hugetlb.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memcg_test.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memory.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_cls.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_prio.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/pids.txt (100%) + create mode 100644 Documentation/cgroup.txt + delete mode 100644 Documentation/cgroups/unified-hierarchy.txt +Merging scsi/for-next (0a5149ba02bd mpt3sas: fix inline markers on non inline function declarations) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (517982229f78 configfs: remove old API) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (d99c8053fc24 pinctrl: pinconf: remove needless loop) +$ git merge pinctrl/for-next +Already up-to-date. +Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_ring.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) +$ git merge remoteproc/for-next +Already up-to-date. +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (0963670aeaec gpio: fix up SPI submenu) +$ git merge gpio/for-next +Already up-to-date. +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (5dcd7b42f1d0 pwm: sunxi: Fix whitespace issue) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits) +$ git merge clk/clk-next +Already up-to-date. +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (6ff33f3902c3 Linux 4.3-rc1) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (3b5bab390181 selftests: breakpoint: Actually build it) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Merge made by the 'recursive' strategy. + drivers/staging/gdm72xx/gdm_sdio.c | 13 ++++---- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +-- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++++------------ + drivers/staging/media/lirc/lirc_sasem.c | 20 ++++++------ + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++++-------------------- + fs/coredump.c | 8 +++-- + kernel/cpuset.c | 12 ++++--- + 7 files changed, 62 insertions(+), 80 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops) +$ git merge borntraeger/linux-next +Auto-merging lib/Makefile +Auto-merging include/linux/dma-mapping.h +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 ++--------------------- + arch/s390/Kconfig | 7 +--- + arch/s390/include/asm/device.h | 6 ++- + arch/s390/include/asm/dma-mapping.h | 6 ++- + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_dma.c | 4 +- + include/linux/dma-mapping.h | 2 + + lib/Makefile | 1 + + lib/dma-noop.c | 75 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 96 insertions(+), 52 deletions(-) + create mode 100644 lib/dma-noop.c +Merging livepatching/for-next (2184037e40ce Merge branch 'for-4.4/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + kernel/livepatch/core.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging coresight/next (a0aede15d496 coresight: checking for NULL string in coresight_name_match()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (1e3929ef0e1c rtc: Add a driver for Micro Crystal RV8803) +$ git merge rtc/rtc-next +Already up-to-date. +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (8de5dff8bae6 libnvdimm: documentation clarifications) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (dcbefa17259c ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging mm/page_alloc.c +Auto-merging mm/hugetlb.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/configfs.h +Auto-merging arch/mips/mm/tlbex.c +Auto-merging arch/arm64/include/asm/pgtable.h +Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-iio | 21 + + .../vm/pmdp_splitting_flush/arch-support.txt | 40 - + Documentation/filesystems/vfat.txt | 10 + + Documentation/iio/iio_configfs.txt | 93 ++ + Documentation/vm/transhuge.txt | 151 +- + arch/arc/mm/cache.c | 4 +- + arch/arm/include/asm/pgtable-3level.h | 9 - + arch/arm/lib/uaccess_with_memcpy.c | 5 +- + arch/arm/mm/flush.c | 17 +- + arch/arm64/include/asm/pgtable.h | 8 - + arch/arm64/mm/flush.c | 16 - + arch/mips/include/asm/pgtable-bits.h | 10 +- + arch/mips/include/asm/pgtable.h | 18 - + arch/mips/mm/c-r4k.c | 3 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/gup.c | 17 +- + arch/mips/mm/init.c | 6 +- + arch/mips/mm/pgtable-64.c | 14 - + arch/mips/mm/tlbex.c | 1 - + arch/powerpc/include/asm/pgtable-ppc64.h | 27 +- + arch/powerpc/mm/hugepage-hash64.c | 3 - + arch/powerpc/mm/hugetlbpage.c | 17 +- + arch/powerpc/mm/pgtable_64.c | 49 - + arch/powerpc/mm/subpage-prot.c | 2 +- + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/mm/gup.c | 24 +- + arch/s390/mm/pgtable.c | 16 - + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/cache.c | 8 +- + arch/sparc/include/asm/pgtable_64.h | 16 - + arch/sparc/mm/fault_64.c | 3 - + arch/sparc/mm/gup.c | 16 +- + arch/tile/include/asm/pgtable.h | 10 - + arch/x86/include/asm/pgtable.h | 9 - + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/vm86_32.c | 6 +- + arch/x86/mm/gup.c | 17 +- + arch/x86/mm/pgtable.c | 14 - + arch/xtensa/mm/tlb.c | 2 +- + block/genhd.c | 2 +- + drivers/iio/Kconfig | 16 + + drivers/iio/Makefile | 2 + + drivers/iio/industrialio-configfs.c | 50 + + drivers/iio/industrialio-sw-trigger.c | 181 +++ + drivers/iio/trigger/Kconfig | 10 + + drivers/iio/trigger/Makefile | 2 + + drivers/iio/trigger/iio-trig-hrtimer.c | 193 +++ + fs/cifs/file.c | 8 +- + fs/configfs/dir.c | 110 ++ + fs/exofs/inode.c | 5 +- + fs/ext4/fsync.c | 5 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 + + fs/fat/inode.c | 75 +- + fs/hugetlbfs/inode.c | 44 +- + fs/nfs/objlayout/objio_osd.c | 5 +- + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1120 ++++++++------- + fs/ocfs2/aops.h | 11 +- + fs/ocfs2/dlm/dlmconvert.c | 24 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/file.c | 138 +- + fs/ocfs2/inode.c | 3 + + fs/ocfs2/inode.h | 3 + + fs/ocfs2/journal.c | 8 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 16 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/super.c | 38 +- + fs/ocfs2/super.h | 2 - + fs/proc/page.c | 4 +- + fs/proc/task_mmu.c | 55 +- + include/asm-generic/dma-mapping-common.h | 2 +- + include/asm-generic/pgtable.h | 9 - + include/linux/configfs.h | 10 + + include/linux/crc64_ecma.h | 56 + + include/linux/dma-debug.h | 6 +- + include/linux/huge_mm.h | 61 +- + include/linux/iio/sw_trigger.h | 71 + + include/linux/kexec.h | 2 + + include/linux/memcontrol.h | 16 +- + include/linux/mm.h | 119 +- + include/linux/mm_types.h | 20 +- + include/linux/mmdebug.h | 6 + + include/linux/page-flags.h | 282 ++-- + include/linux/pagemap.h | 38 +- + include/linux/poison.h | 9 +- + include/linux/rmap.h | 16 +- + include/linux/slab.h | 43 +- + include/linux/string.h | 1 + + include/linux/swap.h | 5 +- + include/linux/vm_event_item.h | 4 +- + include/trace/events/huge_memory.h | 166 +++ + ipc/msg.c | 5 +- + kernel/events/uprobes.c | 11 +- + kernel/futex.c | 63 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 18 + + lib/Makefile | 1 + + lib/crc64_ecma.c | 341 +++++ + lib/dma-debug.c | 6 +- + lib/string_helpers.c | 63 +- + mm/debug.c | 8 +- + mm/filemap.c | 25 +- + mm/gup.c | 114 +- + mm/huge_memory.c | 1446 ++++++++++++-------- + mm/hugetlb.c | 12 +- + mm/internal.h | 74 +- + mm/ksm.c | 63 +- + mm/memcontrol.c | 84 +- + mm/memory-failure.c | 77 +- + mm/memory.c | 77 +- + mm/mempolicy.c | 40 +- + mm/migrate.c | 21 +- + mm/mincore.c | 2 +- + mm/mlock.c | 12 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 15 +- + mm/page_alloc.c | 34 +- + mm/page_idle.c | 66 +- + mm/pagewalk.c | 2 +- + mm/pgtable-generic.c | 12 - + mm/rmap.c | 268 ++-- + mm/shmem.c | 25 +- + mm/slab.c | 87 +- + mm/slub.c | 264 +++- + mm/swap.c | 274 +--- + mm/swap_state.c | 4 +- + mm/swapfile.c | 16 +- + mm/userfaultfd.c | 8 +- + mm/util.c | 54 +- + mm/vmpressure.c | 2 +- + mm/vmscan.c | 2 +- + mm/vmstat.c | 4 +- + scripts/checkpatch.pl | 44 +- + 141 files changed, 4671 insertions(+), 3133 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-iio + delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt + create mode 100644 Documentation/iio/iio_configfs.txt + create mode 100644 drivers/iio/industrialio-configfs.c + create mode 100644 drivers/iio/industrialio-sw-trigger.c + create mode 100644 drivers/iio/trigger/iio-trig-hrtimer.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/iio/sw_trigger.h + create mode 100644 include/trace/events/huge_memory.h + create mode 100644 lib/crc64_ecma.c +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 2e7f56375b67...a0bab9bf631e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (a0bab9bf631e Merge branch 'akpm-current/current') +$ git merge --no-ff akpm/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..71efc215b339 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.3 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 1dc51b8288007753ad7cd7d08bb8fa930fc8bb10 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..c388fc95b880 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20151117 |