Hi all, Changes since 20120201: The logfs tree lost its conflicts. The l2-mtd tree lost a conflict. The modem-shm tree lost its build failure. ---------------------------------------------------------------------------- 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" as mentioned in the FAQ on the wiki (see below). 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. After the final fixups (if any), it is also built with powerpc allnoconfig (32 and 64 bit), ppc44x_defconfig and allyesconfig (minus CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc and sparc64 defconfig. These builds also have CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and CONFIG_DEBUG_INFO disabled when necessary. Below is a summary of the state of the merge. We are up to 179 trees (counting Linus' and 26 trees of patches pending for Linus' tree), more are welcome (even if they are currently empty). Thanks to those who have contributed, and to those who haven't, please do. 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. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx $ git checkout master $ git reset --hard stable Merging origin/master (62aa2b5 Linux 3.3-rc2) Merging fixes/master (f8275f9 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux) Merging kbuild-current/rc-fixes (620c231 kbuild: do not check for ancient modutils tools) Merging arm-current/fixes (3c424f3 ARM: 7304/1: ioremap: fix boundary check when reusing static mapping) Applying: ARM: fix up for cache size assumed to be 64 bytes Merging m68k-current/for-linus (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation) Merging powerpc-merge/merge (3493c85 powerpc: Fix build on some non-freescale platforms) Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) Merging sparc/master (e51e07e sparc32: forced setting of mode of sun4m per-cpu timers) Merging scsi-rc-fixes/master (6f6c2aa [SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority) Merging net/master (786f528 ethtool: Null-terminate filename passed to ethtool_ops::flash_device) Merging sound-current/for-linus (ea51e50 Merge branch 'fix/asoc' into for-linus) Merging pci-current/for-linus (acb42a3 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux) Merging wireless/master (07ae2df mac80211: timeout a single frame in the rx reorder buffer) Merging driver-core.current/driver-core-linus (0a96265 Merge tag 'driver-core-3.3-rc1-bugfixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) Merging tty.current/tty-linus (523b82e serial: Kill off Moorestown code) Merging usb.current/usb-linus (a0701f0 uwb & wusb: fix kconfig error) Merging staging.current/staging-linus (58702dc Staging: android: Remove pmem driver) Merging char-misc.current/char-misc-linus (7c5763b drivers: misc: Remove MISC_DEVICES config option) Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging input-current/for-linus (7a0a27d Input: serio_raw - return proper result when serio_raw_read fails) Merging md-current/for-linus (307729c md/raid1: perform bad-block tests for WriteMostly devices too.) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (58d7d18 crypto: sha512 - Use binary and instead of modulus) Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) Merging devicetree-current/devicetree/merge (c89810a ARM: prom.h: Fix build error by removing unneeded header file) Merging spi-current/spi/merge (26ed8d0 spi: Add spi-s3c64xx driver dependency on ARCH_EXYNOS4) Merging gpio-current/gpio/merge (95120d5 Correct bad gpio naming) Merging arm/for-next (2a07f5e Merge branches 'fixes', 'l2', 'mmci', 'pcmcia', 'pgt2' and 'misc' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c Merging arm-soc/for-next (f8d0078 Merge branch 'fixes' into for-next) Merging arm-perf/for-next/perf (cdd2a5b Merge branches 'perf/updates' and 'perf/fixes' into for-next/perf) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) Merging s5p/for-next (a291ade Merge branch 'next/devel-samsung' into for-next) Merging tegra/for-next (944a28c Merge branch 'for-3.4' into for-next) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging blackfin/for-linus (0476b92 Blackfin: wire up new process_vm syscalls) Merging c6x/for-linux-next (dcd6c92 Linux 3.3-rc1) Merging cris/for-next (ea78f5b CRIS: Update documentation) Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h) CONFLICT (content): Merge conflict in arch/hexagon/Kconfig Merging ia64/next (65cc21b ia64: Add accept4() syscall) Merging m68k/for-next (2a35350 m68k: Fix assembler constraint to prevent overeager gcc optimisation) Merging m68knommu/for-next (bea0cac m68knommu: clean up linker script) Merging microblaze/next (9afc416 Revert "microblaze: Add topology init") Merging mips/mips-for-linux-next (8551715 Merge branches 'fixes-for-linus' and 'next/lantiq' into mips-for-linux-next) Merging openrisc/for-upstream (b6fd41e Linux 3.1-rc6) Merging parisc/for-next (fc99a91 futex: Use same lock set as lws calls) Merging powerpc/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) Merging 4xx/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) Merging galak/next (ef88e39 powerpc: fix compile error with 85xx/p1010rdb.c) Merging s390/features (a7c541c [S390] cleanup smp code) Merging sparc-next/master (e4e1118 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines) Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")) Merging ceph/for-next (83eb26a ceph: ensure prealloc_blob is in place when removing xattr) Merging cifs/master (2a73ca8 [CIFS] Update cifs Kconfig title to match removal of experimental dependency) Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) Merging ecryptfs/next (8d6d71e eCryptfs: Fix oops when printing debug info in extent crypto functions) Merging ext3/for_next (46fe44c quota: Pass information that quota is stored in system file to userspace) Merging ext4/dev (ad63466 ext4: ignore EXT4_INODE_JOURNAL_DATA flag with delalloc) Merging fuse/for-next (03c9693 cuse: implement memory mapping) Merging gfs2/master (a1b46f1 GFS2: glock statistics gathering) Merging logfs/master (f2933e8 Logfs: Allow NULL block_isbad() methods) Merging nfs/linux-next (a4980e7 NFSv4: ACCESS validation doesn't require a full attribute refresh) Applying: iscsi: in_aton needs linux/inet.h Merging nfsd/nfsd-next (7a6ef8c nfsd4: nfsd4_create_clid_dir return value is unused) Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (3d4a1c8 Squashfs: fix i_blocks calculation with extended regular files) Merging v9fs/for-next (f766619 fs/9p: iattr_valid flags are kernel internal flags map them to 9p values.) Merging ubifs/linux-next (d193609 UBIFS: make the dbg_lock spinlock static) Merging xfs/for-next (4505360 xfs: pass KM_SLEEP flag to kmem_realloc() in xlog_recover_add_to_cnt_trans()) Merging vfs/for-next (dcd6c92 Linux 3.3-rc1) Merging pci/linux-next (fa423b0 PCI: check for pci bar restore completion and retry) Merging hid/for-next (f62f619 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) Merging quilt/i2c (d6d9103 i2c-i801: Use usleep_range to wait for command completion) Merging bjdooks-i2c/next-i2c (fc84fe1 Merge branch 'for_3.3/i2c/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into for-33/i2c/omap) CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-omap.c Merging quilt/jdelvare-hwmon (48a9dee hwmon: (mc13xxx-adc) Add support for the MC13892 PMIC) Merging hwmon-staging/hwmon-next (bcc389a hwmon: (hwmon-vid) Fix checkpatch issues) Merging quilt/kernel-doc (88a2052 Update quilt tree location for Documentation/ patches.) Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move) Merging v4l-dvb/master (1854438 Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (d90898e Merge branch 'kbuild/misc' into kbuild/for-next) Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) Merging libata/NEXT (b73fa46 [libata] ata_piix: Add Toshiba Satellite Pro A120 to the quirks list due to broken suspend functionality.) Merging infiniband/for-next (f36ae34 Merge branches 'cma', 'ipath', 'misc', 'mlx4', 'nes' and 'qib' into for-next) Merging acpi/next (eb7004e Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release) Merging ieee1394/for-next (6e01490 Merge branch 'fixes' into for-next) Merging ubi/linux-next (dcd6c92 Linux 3.3-rc1) Merging dlm/next (60f98d1 dlm: add recovery callbacks) Merging scsi/master (76ffe8a [SCSI] libfc: remove redundant timer init for fcp) Merging target-updates/for-next (895f302 target: Set additional sense length field in sense data) Merging target-merge/for-next-merge (a42d985 ib_srpt: Initial SRP Target merge for v3.3-rc1) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging slave-dma/next (e721171 Merge branch 'fixes' into next) Merging dmaengine/next (d07a74a dmaengine: fix missing 'cnt' in ?: in dmatest) Merging net-next/master (7161c76 atm: clip: Convert over to dst_neigh_lookup().) CONFLICT (content): Merge conflict in drivers/infiniband/hw/nes/nes_cm.c Merging wireless-next/master (b0302ab rtlwifi: Convert to asynchronous firmware load) CONFLICT (content): Merge conflict in drivers/net/wireless/rtlwifi/rtl8192se/sw.c Merging bluetooth/master (c5993de Bluetooth: Correct packet len calculation) Merging mtd/master (f5eee48 mtd: cfi: AMD/Fujitsu compatibles: add panic write support) Merging l2-mtd/master (8ab762e mtd: add leading underscore to all mtd functions) CONFLICT (content): Merge conflict in drivers/mtd/nand/gpmi-nand/gpmi-lib.c CONFLICT (content): Merge conflict in drivers/mtd/chips/cfi_cmdset_0002.c Merging crypto/master (65a4a57 crypto: caam - fix gcc 4.6 warning) CONFLICT (content): Merge conflict in arch/arm/mach-tegra/fuse.c Merging sound/for-next (3833c69 Merge branch 'fix/hda' into for-next) Merging sound-asoc/for-next (79ddb08 Merge branch 'for-3.4' into asoc-next) CONFLICT (content): Merge conflict in sound/soc/codecs/wm5100.c Merging cpufreq/next (6c523c6 [CPUFREQ] EXYNOS: Removed useless headers and codes) Merging quilt/rr (6d1d688 module: Remove module size limit) Merging input/next (4065d1e Input: add Cypress TTSP capacitive multi-touch screen support) Merging input-mt/for-next (62aa2b5 Linux 3.3-rc2) Merging block/for-next (b3021da Merge branch 'for-3.3/core' into for-next) Merging quilt/device-mapper (dcd6c92 Linux 3.3-rc1) Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) Merging battery/master (913272b Merge git://git.infradead.org/users/cbou/battery-urgent) Merging mmc/mmc-next (3a017ac mmc: of_mmc_spi: fix little endian support) Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack()) Merging slab/for-next (0ad9500 slub: prefetch next freelist pointer in slab_alloc()) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (34f8ac6 Prevent DM RAID from loading bitmap twice.) Merging mfd/for-next (f365f51 mfd: Avoid twl6040-codec PLL reconfiguration when not needed) Merging drm/drm-next (095f979 drm/nouveau/pm: fix build with HWMON off) Merging fbdev/fbdev-next (c6d242a video: convert drivers/video/* to use module_spi_driver()) Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value) Merging omap_dss2/for-next (9a90168 OMAPDSS: HDMI: Disable DDC internal pull up) Merging regulator/for-next (cff4a58 Merge tag 'devm' into regulator-next) Merging security/next (7b7e591 ima: fix invalid memory reference) Merging selinux/master (dc2e1ff Merge commit 'v3.2' into 20120130) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/linux-next (3e43563 watchdog: hpwdt: clean up set_memory_x call for 32 bit) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (05dc8af Merge branches 'iommu/fixes' and 'arm/tegra' into next) Merging osd/linux-next (0aa436b exofs: Cap on the memcpy() size) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (9879326 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (6055a36 Merge branch 'pm-qos' into linux-next) Merging apm/for-next (b4a133d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) Merging edac/linux_next (4d096ca MAINTAINERS: add an entry for Edac Sandy Bridge driver) Merging edac-amd/for-next (ed8ccfa Merge branch '3.3-edac-scrubrate' into edac-for-next) Merging devicetree/devicetree/next (07d57a3 drivercore: Output common devicetree information in uevent) Merging spi/spi/next (bc26618 Merge branch 'spi/s3c64xx' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc) Merging gpio/gpio/next (f408c98 GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion) Merging tip/auto-latest (1105d3a Merge branch 'x86/urgent' into auto-latest) Merging rcu/rcu/next (f0312a5 rcu: Bring RTFP.txt up to date.) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (af1d40c perf: perf interface for uprobes) Applying: uprobes: bad merge fix Merging cgroup/for-next (61d1d21 cgroup: remove extra calls to find_existing_css_set) Merging kmemleak/kmemleak (b370d29 kmemleak: Disable early logging when kmemleak is off by default) Merging kvm/linux-next (5753785 KVM: do not #GP on perf MSR writes when vPMU is disabled) Merging oprofile/for-next (42fcb11 Merge branch 'oprofile/perf-ibs-v4' into oprofile/for-next) CONFLICT (content): Merge conflict in tools/perf/util/header.h CONFLICT (content): Merge conflict in tools/perf/util/header.c Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen) CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h Merging xen-two/linux-next (5496167 Merge branch 'stable/for-linus-fixes-3.3' into linux-next) Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (26dd8e0 percpu: use bitmap_clear) Merging workqueues/for-next (6b3da11 Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) Merging sysctl/master (0f94af7 sysctl: fix memset parameters in setup_sysctl_set()) Merging regmap/for-next (d99c796 Merge branch 'regmap-core' into regmap-next) CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging driver-core/driver-core-next (d5c38b1 sysfs: Update the name hash when renaming sysfs entries) CONFLICT (content): Merge conflict in drivers/acpi/processor_driver.c Merging tty/tty-next (d4e33fa serial: Kill off NO_IRQ) Merging usb/usb-next (fec67b4 usb: cdc-wdm: Add device-id for Huawei 3G/LTE modems) CONFLICT (content): Merge conflict in drivers/usb/class/cdc-wdm.c Merging staging/staging-next (e96045a staging: nvec: Fix Kconfig dependencies) Merging char-misc/char-misc-next (a3dc3c9 MISC: convert drivers/misc/* to use module_spi_driver()) Merging tmem/linux-next (b05b561 Merge branch 'devel/frontswap.v13' into linux-next) Merging writeback/writeback-for-next (3310225 lib: proportion: lower PROP_MAX_SHIFT to 32 on 64-bit kernel) Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) Merging pinctrl/for-next (f4e6698 pinctrl: enable pinmux for mmp series) Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h) Merging vhost/linux-next (1e05b62 sh: use the the PCI channels's io_map_base) Merging kmap_atomic/kmap_atomic (2c2c817 feature-removal-schedule.txt: add the deprecated form of kmap_atomic()) CONFLICT (content): Merge conflict in fs/ecryptfs/read_write.c CONFLICT (modify/delete): drivers/staging/gma500/mmu.c deleted in HEAD and modified in kmap_atomic/kmap_atomic. Version kmap_atomic/kmap_atomic of drivers/staging/gma500/mmu.c left in tree. CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt $ git rm -f drivers/staging/gma500/mmu.c Merging modem-shm/for-next (b30d221 caif_shm: Add CAIF driver for Shared memory for M7400) Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) Merging remoteproc/for-next (238c1e1 rpmsg: depends on EXPERIMENTAL) Applying: rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf Applying: remoteproc: don't use virtio's weak barriers Merging kvmtool/master (29b2ad1 kvm tools: Cleanup BDF searching code) Merging ktest/for-next (be405f9 ktest: Add INGORE_ERRORS to ignore warnings in boot up) Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: drivers/cpufreq/gx-suspmod.c: fix build Applying: mm/memcontrol.c: fix warning with CONFIG_NUMA=n Applying: mm/filemap_xip.c: fix race condition in xip_file_fault() Applying: mm-filemap_xipc-fix-race-condition-in-xip_file_fault-fix Applying: lkdtm: avoid calling lkdtm_do_action() with spinlock held Applying: drivers/tty/vt/vt_ioctl.c: fix KDFONTOP 32bit compatibility layer Applying: kprobes: fix a memory leak in function pre_handler_kretprobe() Applying: kprobes-fix-a-memory-leak-in-function-pre_handler_kretprobe-fix Applying: readahead: fix pipeline break caused by block plug Applying: mm: compaction: check pfn_valid when entering a new MAX_ORDER_NR_PAGES block during isolation for migration Applying: drivers/base/memory.c: fix memory_dev_init() long delay Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy Applying: pcmcia: fix socket refcount decrementing on each resume Applying: vfs: fix panic in __d_lookup() with high dentry hashtable counts Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314 Applying: acerhdf: add support for new hardware Applying: acerhdf: lowered default temp fanon/fanoff values Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver Applying: x86, olpc-xo15-sci: enable lid close wakeup control through sysfs Applying: geos: platform driver for Geos and Geos2 single-board computers Applying: platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver() Applying: x86, olpc: add debugfs interface for EC commands Applying: x86, mm: fix the size calculation of mapping tables Applying: alix2: supplement driver to include GPIO button support Applying: alix2-supplement-driver-to-include-gpio-button-support-fix Applying: x86: net5501: platform driver for Soekris Engineering net5501 single-board computer Applying: net5501-platform-driver-for-soekris-engineering-net5501-single-board-computer-fix Applying: drivers/platform/x86/sony-laptop.c: fix scancodes Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file Applying: arm, exec: remove redundant set_fs(USER_DS) Applying: fs/btrfs/inode-map.c: fix warnings Applying: net: use this_cpu_xxx replace percpu_xxx funcs Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs Applying: arch/x86/kernel/nmi_selftest.c needs percpu.h Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix-2 Applying: x86: change percpu_read_stable() to this_cpu_read_stable() Applying: percpu: remove percpu_xxx() functions Applying: Subject irqs: fix long-term regression in genirq irq_set_irq_type() handling Applying: irqs: fix handling of pending IRQs at request time Applying: hrtimers: Special-case zero length sleeps Applying: hpet: factor timer allocate from open Applying: drivers/thermal/thermal_sys.c: fix build warning Applying: thermal-thermal_sys-fix-build-warning-fix Applying: thermal_sys: remove unnecessary line continuations Applying: thermal_sys: remove obfuscating used-once macros Applying: thermal_sys: kernel style cleanups Applying: thermal_sys: convert printks to pr_<level> Applying: bluetooth: add support for BCM20702A0 [0a5c:21e6] Applying: debugobjects: Fix selftest for static warnings Applying: ocfs2: use find_last_bit() Applying: ocfs2: use bitmap_weight() Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock Applying: drivers/scsi/mpt2sas/mpt2sas_scsih.c: spell "primitive" correctly Applying: drivers/scsi/hpsa.c: use find_first_zero_bit() Applying: bio: don't overflow in bio_get_nr_vecs() Applying: loop: zero fill bio instead of return -EIO for partial read Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media Applying: mm, oom: avoid looping when chosen thread detaches its mm Applying: mm, oom: fold oom_kill_task() into oom_kill_process() Applying: mm, oom: do not emit oom killer warning if chosen thread is already exiting Applying: mm: add rss counters consistency check Applying: mm/vmscan.c: cleanup with s/reclaim_mode/isolate_mode/ Applying: mm: make get_mm_counter static-inline Applying: mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone() Applying: mm: make swapin readahead skip over holes Applying: make-swapin-readahead-skip-over-holes-fix Applying: vmscan: reclaim at order 0 when compaction is enabled Applying: vmscan: kswapd carefully call compaction Applying: vmscan-kswapd-carefully-call-compaction-fix Applying: vmscan: only defer compaction for failed order and higher Applying: mm: fix page-faults detection in swap-token logic Applying: mm: add extra free kbytes tunable Applying: mm-add-extra-free-kbytes-tunable-update Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes Applying: memcg: replace MEM_CONT by MEM_RES_CTLR Applying: memcg: replace mem and mem_cont stragglers Applying: memcg: lru_size instead of MEM_CGROUP_ZSTAT Applying: memcg: enum lru_list lru Applying: memcg: remove redundant returns Applying: memcg: remove unnecessary thp check in page stat accounting Applying: idr: make idr_get_next() good for rcu_read_lock() Applying: cgroup: revert ss_id_lock to spinlock Applying: memcg: let css_get_next() rely upon rcu_read_lock() Applying: memcg: remove PCG_CACHE page_cgroup flag Applying: memcg-remove-pcg_cache-page_cgroup-flag-checkpatch-fixes Applying: magic.h: move some FS magic numbers into magic.h Applying: ceph, cifs, nfs, fuse: boolean and / or confusion Applying: prctl: add PR_{SET,GET}_CHILD_SUBREAPER to allow simple process supervision Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix Applying: prctl-add-pr_setget_child_subreaper-to-allow-simple-process-supervision-fix-fix-fix Applying: kernel/exit.c: if init dies, log a signal which killed it, if any Applying: kernel-exitc-if-init-dies-log-a-signal-which-killed-it-if-any-fix Applying: vfs: increment iversion when a file is truncated Applying: brlocks/lglocks: cleanups Applying: brlocks-lglocks-cleanups-checkpatch-fixes Applying: vfs: correctly set the dir i_mutex lockdep class Applying: seq_file: fix mishandling of consecutive pread() invocations. Applying: MAINTAINERS: fix REMOTEPROC F: typo Applying: backlight: convert backlight i2c drivers to module_i2c_driver Applying: backlight: convert backlight spi drivers to module_spi_driver Applying: drivers/video/backlight/wm831x_bl.c: use devm_ functions Applying: drivers/video/backlight: use devm_ functions Applying: drivers/video/backlight/adp5520_bl.c: use devm_ functions Applying: backlight: new backlight driver for LP855x devices Applying: video: support MIPI-DSI controller driver Applying: video: backlight: support s6e8ax0 panel driver based on MIPI DSI Applying: video-backlight-support-s6e8ax0-panel-driver-based-on-mipi-dsi-fix Applying: WARNING: please write a paragraph that describes the config symbol fully Applying: bitops: rename for_each_set_bit_cont() in favor of analogous list.h function Applying: bitops: remove for_each_set_bit_cont() Applying: bitops: introduce for_each_clear_bit() Applying: mtd: use for_each_clear_bit() Applying: s390/char: use for_each_clear_bit() Applying: uwb: use for_each_clear_bit() Applying: x86: use for_each_clear_bit_from() Applying: drivers/leds/leds-lp5521.c: fix typo Applying: drivers/leds/leds-tca6507.c: cleanup error handling in tca6507_probe() Applying: drivers/leds/leds-lp5521.c: add 'name' in the lp5521_led_config Applying: drivers/leds/leds-lp5521.c: add 'update_config' in the lp5521_platform_data Applying: drivers/leds/leds-lp5521.c: support led pattern data Applying: leds-lp5521-support-led-pattern-data-checkpatch-fixes Applying: drivers/leds/leds-lp5521.c: redefinition of register bits Applying: drivers/leds/leds-lp5523.c: constify some data Applying: include/ and checkpatch: prefer __scanf to __attribute__((format(scanf,...) Applying: crc32: remove two instances of trailing whitespaces Applying: crc32: move long comment about crc32 fundamentals to Documentation/ Applying: crc32-move-long-comment-about-crc32-fundamentals-to-documentation-fix Applying: crc32: simplify unit test code Applying: crc32: miscellaneous cleanups Applying: crc32: fix mixing of endian-specific types Applying: crc32: make CRC_*_BITS definition correspond to actual bit counts Applying: crc32: add slice-by-8 algorithm to existing code Applying: crc32: optimize loop counter for x86 Applying: crc32: add note about this patchset to crc32.c Applying: crc32: bolt on crc32c Applying: crc32: Don't reference unnecessary crc32 tables in single-bit mode Applying: crypto: crc32c should use library implementation Applying: crc32: add self-test code for crc32c Applying: crc32: select an algorithm via Kconfig Applying: epoll: comment the funky #ifdef Applying: init/do_mounts.c: create /root if it does not exist Applying: rtc-spear: fix for balancing the enable_irq_wake in Power Mgmt Applying: rtc/spear: fix for RTC_AIE_ON and RTC_AIE_OFF ioctl errors Applying: rtc/rtc-spear: call platform_set_drvdata() before registering rtc device Applying: rtc: convert rtc spi drivers to module_spi_driver Applying: rtc: convert rtc i2c drivers to module_i2c_driver Applying: MIPS: add RTC support for loongson1B Applying: drivers/rtc/rtc-twl.c: optimize IRQ bit access Applying: drivers/rtc/rtc-twl.c: enable RTC irrespective of its prior state Applying: drivers/rtc/rtc-twl.c: simplify RTC interrupt clearing Applying: drivers/rtc/rtc-twl.c: return correct RTC event from ISR Applying: kmod: avoid deadlock from recursive kmod call Applying: kmod-avoid-deadlock-by-recursive-kmod-call-fix Applying: fs/proc/kcore.c: make get_sparsemem_vmemmap_info() static Applying: proc: speedup /proc/stat handling Applying: procfs: add num_to_str() to speed up /proc/stat Applying: procfs-add-num_to_str-to-speed-up-proc-stat-fix Applying: procfs: speed up /proc/pid/stat, statm Applying: procfs-speed-up-proc-pid-stat-statm-checkpatch-fixes Applying: proc: clean up /proc/<pid>/environ handling Applying: smp: introduce a generic on_each_cpu_mask() function Applying: arm: move arm over to generic on_each_cpu_mask Applying: tile: move tile to use generic on_each_cpu_mask Applying: smp: add func to IPI cpus based on parameter func Applying: smp-add-func-to-ipi-cpus-based-on-parameter-func-fix Applying: slub: only IPI CPUs that have per cpu obj to flush Applying: fs: only send IPI to invalidate LRU BH when needed Applying: mm: only IPI CPUs to drain local pages if they exist Applying: ipc/sem.c: alternatives to preempt_disable() Applying: ipc: provide generic compat versions of IPC syscalls Applying: sysctl: use bitmap library functions Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE Applying: ramoops: use pstore interface Applying: notify_change(): check that i_mutex is held Merging akpm (7b3418a notify_change(): check that i_mutex is held)
Attachment:
pgpEdrx5f229d.pgp
Description: PGP signature
