linux-next: Tree for Dec 15
Hi all, Changes since 20201214: The ceph tree gained a semantic conflict against Linus' tree. The nfs tree gained a conflict agsinst Linus' tree. The cel tree gained conflicts agsinst the nfs tree. The thermal tree gained a build failure so I used the version from next-20101214. The keys tree still had its build failure for which I applied a patch. The watchdog tree still had its build failure so I used the version from next-20201211. Non-merge commits (relative to Linus' tree): 9796 9081 files changed, 379930 insertions(+), 176630 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig and htmldocs. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 327 trees (counting Linus' and 85 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (9e4b0d55d84a Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fixes/fixes (9223e74f9960 Merge tag 'io_uring-5.10-2020-11-27' of git://git.kernel.dk/linux-block) Merging kbuild-current/fixes (7d32358be8ac kbuild: avoid split lines in .mod files) Merging arc-current/for-curr (3a71e423133a ARC: build: use $(READELF) instead of hard-coded readelf) Merging arm-current/fixes (e64ab473ddda ARM: 9034/1: __div64_32(): straighten up inline asm constraints) Merging arm64-fixes/for-next/fixes (929c1f3384d7 arm64: mte: fix prctl(PR_GET_TAGGED_ADDR_CTRL) if TCF0=NONE) Merging arm-soc-fixes/arm/fixes (43ffe817bfe3 arm64: dts: bitmain: Use generic "ngpios" rather than "snps,nr-gpios") Merging drivers-memory-fixes/fixes (3650b228f83a Linux 5.10-rc1) Merging m68k-current/for-linus (2ae92e8b9b7e MAINTAINERS: Update m68k Mac entry) Merging powerpc-fixes/fixes (5eedf9fe8db2 powerpc/mm: Fix KUAP warning by providing copy_from_kernel_nofault_allowed()) Merging s390-fixes/fixes (b1cae1f84a0f s390: fix irq state tracing) Merging sparc/master (0a95a6d1a4cd sparc: use for_each_child_of_node() macro) Merging fscrypt-current/for-stable (d19d8d345eec fscrypt: fix inline encryption not used on new files) Merging net/master (7f376f1917d7 Merge tag 'mtd/fixes-for-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux) Merging bpf/master (7f376f1917d7 Merge tag 'mtd/fixes-for-5.10-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux) Merging ipsec/master (48f486e13ffd net: xfrm: fix memory leak in xfrm_user_policy()) Merging netfilter/master (177745beebe3 MAINTAINERS: Add entry for Marvell Prestera Ethernet Switch driver) Merging ipvs/master (177745beebe3 MAINTAINERS: Add entry for Marvell Prestera Ethernet Switch driver) Merging wireless-drivers/master (74a8c816fa8f rtw88: debug: Fix uninitialized memory in debugfs code) Merging mac80211/master (2c85ebc57b3e Linux 5.10) Merging rdma-fixes/for-rc (340b940ea0ed RDMA/cm: Fix an attempt to use non-valid pointer when cleaning timewait) Merging sound-current/for-linus (598100be3053 Merge tag 'asoc-v5.11' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) Merging sound-asoc-fixes/for-linus (a1c0ffc5b481 Merge remote-tracking branch 'asoc/for-5.11' into asoc-linus) Merging regmap-fixes/for-linus (e6e9354b5830 regmap: Remove duplicate `type` field from regmap `regcache_sync` trace event) Merging regulator-fixes/for-linus (291de1d102fa regulator: axp20x: Fix DLDO2 voltage control register mask for AXP2
Re: linux-next: Tree for Dec 15
Hi Sergey, On Fri, 15 Dec 2017 15:54:22 +0900 Sergey Senozhatsky wrote: > > hm, still no next-20171215 at > https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/refs/ It seems that the mirroring has failed, as the backend has been updated correctly (I even did it again but it was all up to date). Thanks for letting me know. -- Cheers, Stephen Rothwell
Re: linux-next: Tree for Dec 15
Hello, On (12/15/17 15:13), Stephen Rothwell wrote: > Hi all, > > Changes since 20171214: > > New tree: init_task > > The staging.current tree still had its build failure for which I reverted > a commit. hm, still no next-20171215 at https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/refs/ -ss
linux-next: Tree for Dec 15
Hi all, Changes since 20171214: New tree: init_task The staging.current tree still had its build failure for which I reverted a commit. Non-merge commits (relative to Linus' tree): 4569 4982 files changed, 156683 insertions(+), 143157 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig and pseries_le_defconfig and i386, sparc and sparc64 defconfig. And finally, a simple boot test of the powerpc pseries_le_defconfig kernel in qemu (with and without kvm enabled). Below is a summary of the state of the merge. I am currently merging 253 trees (counting Linus' and 43 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (d455df0bcc00 Merge tag '4.15-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6) Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) Merging kbuild-current/fixes (cfe17c9bbe6a kbuild: move cc-option and cc-disable-warning after incl. arch Makefile) Merging arc-current/for-curr (799ab4a2c85b arc: do not use __print_symbol()) Merging arm-current/fixes (3aaf33bebda8 ARM: avoid faulting on qemu) Merging m68k-current/for-linus (5e387199c17c m68k/defconfig: Update defconfigs for v4.14-rc7) Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) Merging powerpc-fixes/fixes (110df8bd3e41 powerpc/perf: Fix kfree memory allocated for nest pmus) Merging sparc/master (a0908a1b7d68 Merge branch 'akpm' (patches from Andrew)) Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) Merging net/master (8c8f67a46f2b Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging bpf/master (8c8f67a46f2b Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) Merging ipsec/master (d2950278d2d0 xfrm: put policies when reusing pcpu xdst entry) Merging netfilter/master (d6da83813fb3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) Merging wireless-drivers/master (a41886f56b7b Merge tag 'iwlwifi-for-kalle-2017-12-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) Merging mac80211/master (4564b187c163 nl80211: fix nl80211_send_iface() error paths) Merging sound-current/for-linus (c1cfd9025cc3 ALSA: rawmidi: Avoid racy info ioctl via ctl device) Merging pci-current/for-linus (e1a355add3c2 PCI: endpoint: Fix find_first_zero_bit() usage) Merging driver-core.current/driver-core-linus (50c4c4e268a2 Linux 4.15-rc3) Merging tty.current/tty-linus (50c4c4e268a2 Linux 4.15-rc3) Merging usb.current/usb-linus (48a4ff1c7bb5 USB: core: prevent malicious bNumInterfaces overflow) Merging usb-gadget-fixes/fixes (9dbe416b656b Revert "usb: gadget: allow to enable legacy drivers without USB_ETH") Merging usb-serial-fixes/usb-linus (762ff4678e89 USB: serial: usb_debug: add new USB device id) Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) Merging phy/fixes (521e84ab2507 phy: rcar-gen3-usb2: select USB_COMMON) Merging staging.current/staging-linus (d98e6dbf42f7 staging: ion: Fix ion_cma_heap allocations) Applying: Revert "staging: ion: Fix ion_cma_heap allocations" Merging char-misc.current/char-misc-linus (50c4c4e268a2 Linux 4.15-rc3) Merging input-current/for-linus (4c83c071b784 Input: elants_i2c - do not clobber interrupt trigger on x86) Merging crypto-current/master (d53c51357923 crypto: af_alg - fix race accessing cipher request) Merging ide/mast
Re: linux-next: Tree for Dec 15 (fs/ubifs/ causes problems in fs/crypto/)
Randy, On 15.12.2016 19:13, Randy Dunlap wrote: > On 12/14/16 19:21, Stephen Rothwell wrote: >> Hi all, >> >> Please do not add any material for v4.11 to your linux-next included >> branches until after v4.10-rc1 has been released. >> >> Changes since 20161214: >> > > on x86_64: > > when CONFIG_BLOCK is not enabled: > > warning: (UBIFS_FS_ENCRYPTION) selects FS_ENCRYPTION which has unmet direct > dependencies (BLOCK) UBIFS does not depend on CONFIG_BLOCK but fs/crypto/ does. As short-term solution we can make UBIFS_FS_ENCRYPTION depend on CONFIG_BLOCK, a better solution would be extracting all block specific stuff from fs/crypto/crypto.c to another file. Thanks, //richard
Re: linux-next: Tree for Dec 15 (fs/ubifs/ causes problems in fs/crypto/)
On 12/14/16 19:21, Stephen Rothwell wrote:
> Hi all,
>
> Please do not add any material for v4.11 to your linux-next included
> branches until after v4.10-rc1 has been released.
>
> Changes since 20161214:
>
on x86_64:
when CONFIG_BLOCK is not enabled:
warning: (UBIFS_FS_ENCRYPTION) selects FS_ENCRYPTION which has unmet direct
dependencies (BLOCK)
../fs/crypto/crypto.c: In function 'fscrypt_zeroout_range':
../fs/crypto/crypto.c:355:3: error: implicit declaration of function
'bio_alloc' [-Werror=implicit-function-declaration]
bio = bio_alloc(GFP_NOWAIT, 1);
^
../fs/crypto/crypto.c:355:7: warning: assignment makes pointer from integer
without a cast [enabled by default]
bio = bio_alloc(GFP_NOWAIT, 1);
^
../fs/crypto/crypto.c:360:6: error: dereferencing pointer to incomplete type
bio->bi_bdev = inode->i_sb->s_bdev;
^
../fs/crypto/crypto.c:361:6: error: dereferencing pointer to incomplete type
bio->bi_iter.bi_sector =
^
../fs/crypto/crypto.c:363:3: error: implicit declaration of function
'bio_set_op_attrs' [-Werror=implicit-function-declaration]
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
^
../fs/crypto/crypto.c:363:25: error: 'REQ_OP_WRITE' undeclared (first use in
this function)
bio_set_op_attrs(bio, REQ_OP_WRITE, 0);
^
../fs/crypto/crypto.c:363:25: note: each undeclared identifier is reported only
once for each function it appears in
../fs/crypto/crypto.c:364:3: error: implicit declaration of function
'bio_add_page' [-Werror=implicit-function-declaration]
ret = bio_add_page(bio, ciphertext_page,
^
../fs/crypto/crypto.c:369:4: error: implicit declaration of function 'bio_put'
[-Werror=implicit-function-declaration]
bio_put(bio);
^
../fs/crypto/crypto.c:373:3: error: implicit declaration of function
'submit_bio_wait' [-Werror=implicit-function-declaration]
err = submit_bio_wait(bio);
^
../fs/crypto/crypto.c:374:24: error: dereferencing pointer to incomplete type
if ((err == 0) && bio->bi_error)
^
../fs/crypto/crypto.c: In function 'completion_pages':
../fs/crypto/crypto.c:457:2: error: implicit declaration of function
'bio_for_each_segment_all' [-Werror=implicit-function-declaration]
bio_for_each_segment_all(bv, bio, i) {
^
../fs/crypto/crypto.c:457:39: error: expected ';' before '{' token
bio_for_each_segment_all(bv, bio, i) {
^
cc1: some warnings being treated as errors
--
~Randy
linux-next: Tree for Dec 15
Hi all, Please do not add any material for v4.11 to your linux-next included branches until after v4.10-rc1 has been released. Changes since 20161214: The btrfs-kdave tree gained a conflict against Linus' tree. The rdma tree gained a conflict against Linus' tree. Non-merge commits (relative to Linus' tree): 3500 3722 files changed, 170425 insertions(+), 86100 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig (with CONFIG_BUILD_DOCSRC=n) for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. After the final fixups (if any), I do an x86_64 modules_install followed by builds for x86_64 allnoconfig, powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig (with KALLSYMS_EXTRA_PASS=1) and pseries_le_defconfig and i386, sparc and sparc64 defconfig. Below is a summary of the state of the merge. I am currently merging 245 trees (counting Linus' and 35 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwell $ git checkout master $ git reset --hard stable Merging origin/master (d05c5f7ba164 vfs,mm: fix return value of read() at s_maxbytes) Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging kbuild-current/rc-fixes (152b695d7437 builddeb: fix cross-building to arm64 producing host-arch debs) Merging arc-current/for-curr (7badf6fefca8 ARC: axs10x: really enable ARC PGU) Merging arm-current/fixes (8478132a8784 Revert "arm: move exports to definitions") Merging m68k-current/for-linus (7e251bb21ae0 m68k: Fix ndelay() macro) Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) Merging powerpc-fixes/fixes (dadc4a1bb9f0 powerpc/64: Fix placement of .text to be immediately following .head.text) Merging sparc/master (8fa3b6f9392b Merge tag 'cris-for-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris) Merging net/master (3e1ed981b7a9 netlink: revert broken, broken "2-clause nla_ok()") Merging ipsec/master (bc3913a5378c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) Merging netfilter/master (a220871be66f virtio-net: correctly enable multiqueue) Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging wireless-drivers/master (fcd2042e8d36 mwifiex: printk() overflow with 32-byte SSIDs) Merging mac80211/master (d8da0b5d64d5 mac80211: Ensure enough headroom when forwarding mesh pkt) Merging sound-current/for-linus (995c6a7fd9b9 ALSA: hiface: Fix M2Tech hiFace driver sampling rate change) Merging pci-current/for-linus (e42010d8207f PCI: Set Read Completion Boundary to 128 iff Root Port supports it (_HPX)) Merging driver-core.current/driver-core-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging tty.current/tty-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging usb.current/usb-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging usb-gadget-fixes/fixes (05e78c6933d6 usb: gadget: f_fs: fix wrong parenthesis in ffs_func_req_match()) Merging usb-serial-fixes/usb-linus (46490c347df4 USB: serial: option: add dlink dwm-158) Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) Merging phy/fixes (4320f9d4c183 phy: sun4i: check PMU presence when poking unknown bit of pmu) Merging staging.current/staging-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging char-misc.current/char-misc-linus (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command") Merging input-current/for-linus (2425f1808123 Input: change KEY_DATA from 0x275 to 0x277) Merging crypto-current/master (18e615ad87bc crypto: skcipher - fix crash in virtua
linux-next: Tree for Dec 15
Hi all,
Changes since 20151214:
The samsung-krzk tree gained a conflict against the renesas tree.
The net-next tree gained a conflict against the net tree.
The drm-msm tree gained a build failure for which I applied a merge
fix patch.
The akpm-current tree gained a conflict against the powerpc tree.
Non-merge commits (relative to Linus' tree): 5520
6124 files changed, 220763 insertions(+), 96555 deletions(-)
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" and checkout or reset to the new
master.
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log
files in the Next directory. Between each merge, the tree was built
with a ppc64_defconfig for powerpc and an allmodconfig for x86_64, a
multi_v7_defconfig for arm and a native build of tools/perf. After the
final fixups (if any), I do an x86_64 modules_install followed by builds
for powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig, allyesconfig
(this fails its final link) and pseries_le_defconfig and i386, sparc,
sparc64 and arm defconfig.
Below is a summary of the state of the merge.
I am currently merging 231 trees (counting Linus' and 36 trees of patches
pending for Linus' tree).
Stats about the size of the tree over time can be seen at
http://neuling.org/linux-next-size.html .
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds. And to Paul
Gortmaker for triage and bug fixes.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (9f9499ae8e64 Linux 4.4-rc5)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on
module install)
Merging arc-current/for-curr (3d84ba362b60 ARC: dw2 unwind: Reinstante
unwinding out of modules)
Merging arm-current/fixes (f5e985580978 ARM: 8475/1: SWP emulation: Restore
original *data when failed)
Merging m68k-current/for-linus (21d380e54c30 m68k: Wire up mlock2)
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached
build errors)
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
Merging powerpc-fixes/fixes (dc9c41bd9ece Revert "powerpc/eeh: Don't unfreeze
PHB PE after reset")
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
Merging sparc/master (2c302e7e4105 Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
Merging net/master (2274d3753f6c sh_eth: uninline sh_eth_{write|read}())
Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless
unnitialized variable warnings)
Merging wireless-drivers/master (eeec5d0ef7ee rtlwifi: rtl8821ae: Fix lockups
on boot)
Merging mac80211/master (b7bb11000860 rfkill: copy the name into the rfkill
struct)
Merging sound-current/for-linus (12a6116e6669 ALSA: usb-audio: Add sample rate
inquiry quirk for AudioQuest DragonFly)
Merging pci-current/for-linus (5bd242f824e2 Revert "PCI: hisi: Add HiSilicon
SoC Hip05 PCIe driver")
Merging driver-core.current/driver-core-linus (31ade3b83e18 Linux 4.4-rc3)
Merging tty.current/tty-linus (9ce119f318ba tty: Fix GPF in flush_to_ldisc())
Merging usb.current/usb-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no
DMA controller set)
Merging usb-serial-fixes/usb-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx:
fix a possible NULL dereference)
Merging staging.current/staging-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging char-misc.current/char-misc-linus (9f9499ae8e64 Linux 4.4-rc5)
Merging input-current/for-linus (fd18ab89166a Input: sun4i-lradc-keys - fix
typo in binding documentation)
Merging crypto-current/master (70d906bc1750 crypto: skcipher - Copy iv from
desc even for 0-len walks)
Merging ide/master (1b1050cdc5cd Merge
git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test
for PPC_PSERIES)
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU
mode")
Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size
from sysconf)
Merging back
linux-next: Tree for Dec 15
Hi all, Please do not add any code destined for v3.20 to your linux-next included trees/branches until after v3.19-rc1 is released. Changes since 20141212: The tip tree gained a conflict against the pm tree. The rcu tree lost its build failure. The driver-core tree gained conflicts against Linus' and the watchdog trees. The staging tree gained a conflict against the vfs tree. The akpm-current tree gained a build failure due to a mismerge which I fixed up. The akpm tree lost several patches that turned up elsewhere. Non-merge commits (relative to Linus' tree): 4848 4434 files changed, 148881 insertions(+), 143746 deletions(-) I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There are also quilt-import.log and merge.log files in the Next directory. Between each merge, the tree was built with a ppc64_defconfig for powerpc and an allmodconfig for x86_64 and a multi_v7_defconfig for arm. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (this fails its final link) and i386, sparc, sparc64 and arm defconfig. Below is a summary of the state of the merge. I am currently merging 231 trees (counting Linus' and 32 trees of patches pending for Linus' tree). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (980f3c344ff1 Merge tag 'gpio-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio) Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging kbuild-current/rc-fixes (f114040e3ea6 Linux 3.18-rc1) Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block) Merging m68k-current/for-linus (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages) Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) Merging powerpc-merge-mpe/fixes (b2776bf7149b Linux 3.18) Merging sparc/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging net/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) Merging sound-current/for-linus (0d3aba30b755 ALSA: oxfw: fix detect_loud_models() return value) Merging pci-current/for-linus (5106787a9e08 PCI: tegra: Use physical range for I/O mapping) Merging wireless/master (81c412600f94 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless) Merging driver-core.current/driver-core-linus (206c5f60a3d9 Linux 3.18-rc4) Merging tty.current/tty-linus (009d0431c391 Linux 3.18-rc7) Merging usb.current/usb-linus (009d0431c391 Linux 3.18-rc7) Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead code) Merging usb-serial-fixes/usb-linus (009d0431c391 Linux 3.18-rc7) Merging staging.current/staging-linus (009d0431c391 Linux 3.18-rc7) Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3) Merging input-current/for-linus (a1f9a4072655 Input: xpad - use proper endpoint type) Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) Merging crypto-current/master (8606813a6c89 crypto: tcrypt - Allow speed testing of arbitrary hash functions) Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) Merging rr-fixes/fixes (3438cf549d2f param: fix crash on bad kernel arguments) Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/li
