Hi all, Changes since 20120608: The vfs tree lost its conflicts. The pci tree gained a build failure for which I applied a patch. The wireless tree gained conflicts against the net tree. The bluetooth tree gained a conflict against the wireless tree. The sound-asoc tree gained a build failure so I used the version from next-20120608. The leds tree lost its build failure. The tmem tree lost its conflicts. The akpm tree gained a conflict against the net tree. ---------------------------------------------------------------------------- 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 189 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. And to Paul Gortmaker for triage and bug fixes. 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 (4e3c8a1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi) Merging kbuild-current/rc-fixes (e88aa7b Fix modpost failures in fedora 17) Merging arm-current/fixes (f8f5701 Linux 3.5-rc1) Merging m68k-current/for-linus (d8ce726 m68k: Use generic strncpy_from_user(), strlen_user(), and strnlen_user()) Merging powerpc-merge/merge (7c0482e powerpc/irq: Fix another case of lazy IRQ state getting out of sync) Merging sparc/master (e49e6ff sparc: fix sparc64 build due to leon.h inclusion) Merging net/master (3f16da5 lpc_eth: fix tx completion) Merging sound-current/for-linus (f2a8eca ALSA: hda - Fix detection of Creative SoundCore3D controllers) Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc) Merging wireless/master (3b4a39a Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) Merging driver-core.current/driver-core-linus (bcc2c9c Tools: hv: verify origin of netlink connector message) Merging tty.current/tty-linus (cfaf025 Linux 3.5-rc2) Merging usb.current/usb-linus (f2d0ed7 Merge tag 'fixes-for-v3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) Merging staging.current/staging-linus (afb6a6a staging: omapdrm: fix crash when freeing bad fb) Merging char-misc.current/char-misc-linus (cfaf025 Linux 3.5-rc2) Merging input-current/for-linus (e644dae Merge branch 'next' into for-linus) Merging md-current/for-linus (aba336b md: raid1/raid10: fix problem with merge_bvec_fn) Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) Merging crypto-current/master (7c8d518 crypto: aesni-intel - fix unaligned cbc decrypt for x86-32) Merging ide/master (027253c ide: icside.c: fix printk format string compile warning) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) Merging sh-current/sh-fixes-for-linus (3c3c801 Merge branch 'sh/urgent' into sh-fixes-for-linus) Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting) Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args) Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.) Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast) Merging arm/for-next (bcccc50 ARM: 7420/1: Improve build environment isolation) Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging blackfin/for-linus (672552a blackfin: fix build after add bf60x mach/pm.h) Merging c6x/for-linux-next (8ff98b9 C6X: remove unused config items) Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile) Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal) Merging ia64/next (4035c6d [IA64] Liberate the signal layer from IA64 assembler) Merging m68k/for-next (45b74a0 m68knommu: Allow ColdFire CPUs to use unaligned accesses) Merging m68knommu/for-next (5a6ec9f m68knommu: Add support for the Coldfire m5441x.) Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd) Merging mips/mips-for-linux-next (3b67aae Merge branches 'next/cavium', 'next/jz4740', 'next/lantiq' and 'next/netlogic' into mips-for-linux-next) Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall) Merging parisc/for-next (4c01acc [PARISC] fix code to find libgcc) Merging powerpc/next (2074b1d powerpc: Fix irq distribution) Merging 4xx/next (2074b1d powerpc: Fix irq distribution) Merging mpc5xxx/next (f8d5842 powerpc: Option FB_FSL_DIU is not really optional for mpc512x) Merging galak/next (fa1b42b powerpc/qe: Update the SNUM table for MPC8569 Rev2.0) Merging s390/features (72f6e3a s390/vmlogrdr: cleanup driver attribute usage) Merging sh/sh-latest (1c406e4 sh: use the new generic strnlen_user() function) Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup) Merging tile/master (2ded5c2 tile: add #include to unbreak build after generic init_task conversion) Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two")) Merging ceph/master (a5988c4 libceph: set CLOSED state bit in con_init) Merging cifs/for-next (71fae7e Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging) 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 (e6fe903 eCryptfs: Copy up POSIX ACL and read-only flags from lower mount) Merging ext3/for_next (0324876 ext2: trivial fix to comment for ext2_free_blocks) Merging ext4/dev (b22b1f1 ext4: don't set i_flags in EXT4_IOC_SETFLAGS) Merging fuse/for-next (203627b fuse: fix blksize calculation) Merging gfs2/master (0fe2f1e GFS2: Size seq_file buffer more carefully) Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio) Merging nfs/linux-next (6bcad62 Merge branch 'devel' (early part) into linux-next) Merging nfsd/nfsd-next (6eccece nfsd4: fix, consolidate client_has_state) Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) Merging v9fs/for-next (5fcb08b 9p: BUG before corrupting memory) Merging ubifs/linux-next (12027f1 UBI: correct ubi_wl_flush locking) Merging xfs/for-next (f8f5701 Linux 3.5-rc1) Merging vfs/for-next (2753683 debugfs: get rid of useless arguments to debugfs_{mkdir,symlink}) Merging pci/next (918f8b1 Merge branch 'topic/kong-acpiphp-remove' into next) Merging hid/for-next (ce8512d Merge branch 'upstream' into for-next) Merging quilt/i2c (af56e0a Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client) 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 i2c-embedded/i2c-embedded/for-next (27eeafe I2C: OMAP: Fix timeout problem during suspend.) Merging quilt/jdelvare-hwmon (893b488 hwmon: (coretemp) Document TjMax for 3rd generation i5/i7 processors) Merging hwmon-staging/hwmon-next (dad17b2 hwmon: (ina2xx) Add support for INA220 and INA230) Merging v4l-dvb/master (20a2218 Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (e499c75 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 (2fff275 PATA host controller driver for ep93xx) Merging infiniband/for-next (a3698a9 RDMA/ocrdma: Fixed RQ error CQE polling) Merging acpi/next (8fefc5d Merge branch 'thermal-spear' into next) Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) Merging ieee1394/for-next (7baab9a firewire: ohci: sanity-check MMIO resource) Merging ubi/linux-next (f8f5701 Linux 3.5-rc1) Merging dlm/next (6b4cc8e dlm: fix conversion deadlock from recovery) Merging scsi/for-next (24b1b79 Merge branch 'fixes' into for-next) Merging target-updates/for-next (f80e8ed iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs) Merging target-merge/for-next-merge (54131ef Merge branch 'sbp-target-merge' into for-next-merge) Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) Merging isci/all (6df8ea3 merge: devel rnc-devel fixes) Merging slave-dma/next (ec8a158 dma: tegra: add dmaengine based dma driver) Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops) Merging net-next/master (55afaba inet: Fix BUG triggered by __rt{,6}_get_peer().) Merging wireless-next/master (7f0d9f4 ssb: add missing PCI ID for b/g/n single band BCM4322) CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/pcie/trans.c CONFLICT (content): Merge conflict in MAINTAINERS Merging bluetooth/master (1d0c4da Bluetooth: Fix style in hidp code) CONFLICT (content): Merge conflict in net/bluetooth/hci_event.c Merging mtd/master (ea3b2ea mtd: nand: initialize bitflip_threshold prior to BBT scanning) Merging l2-mtd/master (eba9330 mtd: nand: initialize bitflip_threshold prior to BBT scanning) Merging crypto/master (ef45b83 crypto: aesni-intel - move more common code to ablk_init_common) Merging drm/drm-next (8c91402 Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next) Merging sound/for-next (0e785d0 Merge branch 'fix/hda' into for-next) Merging sound-asoc/for-next (c03d111 Merge branches 'for-3.5' and 'for-3.6' into asoc-next) $ git reset --hard HEAD^ Merging refs/next/20120608/sound-asoc Merging quilt/rr (ba528af init: Drop initcall level output) Merging input/next (8680917 Input: matrix-keymap - fix building keymaps) Merging input-mt/for-next (27c347d Input: MT - fix null pointer warning) Merging cgroup/for-next (6be96a5 cgroup: remove hierarchy_mutex) Merging block/for-next (2ebf6e1 Merge branch 'for-linus' into for-next) Merging quilt/device-mapper (6bc816b Remove the restriction that limits a target's specified maximum incoming I/O size to be a power of 2.) Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) Merging mmc/mmc-next (3e68086 mmc: block: replace __blk_end_request() with blk_end_request()) Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()) Merging slab/for-next (23910c5 Merge branch 'slub/cleanups' into slab/next) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (aba336b md: raid1/raid10: fix problem with merge_bvec_fn) Merging mfd/for-next (29f772d mfd: Fix build break of max77693 by adding REGMAP_I2C option) Merging battery/master (96facd2 smb347-charger: Include missing <linux/err.h>) Merging fbdev/fbdev-next (5c888aa video: bfin_adv7393fb: Convert to kstrtouint_from_user) Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) Merging omap_dss2/for-next (05dd0f5 OMAPDSS: DISPC: Update Accumulator configuration for chroma plane) Merging regulator/for-next (2d3b101 Merge branch 'regulator-drivers' into regulator-next) Merging security/next (66dd07b Merge commit 'v3.5-rc2' into next) Merging selinux/master (c737f82 SELinux: remove unused common_audit_data in flush_unauthorized_files) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/master (cfaf025 Linux 3.5-rc2) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (eee5353 iommu/amd: Fix deadlock in ppr-handling error path) Merging osd/linux-next (8b56a30 exofs: Add SYSFS info for autologin/pNFS export) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging trivial/for-next (c224071 parisc: cleanup quoted include) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) Merging pm/linux-next (6da5e30e Merge branch 'pm-acpi' into linux-next) Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl) Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls) Merging edac/linux_next (95a9e4f Merge branch 'devel' into next) Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next) CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c CONFLICT (content): Merge conflict in Documentation/edac.txt Merging devicetree/devicetree/next (8d6c1ef Merge branch 'devicetree/merge' into devicetree/next) Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices) Merging tip/auto-latest (13c5530 Merge branch 'smp/hotplug') Merging rcu/rcu/next (5b5dcc9 Merge branches 'barrier.2012.06.06a', 'doctorture.2012.06.06a', 'fixes.2012.06.06a' and 'fnh.2012.06.06a' into HEAD) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error) Merging kvm/linux-next (25e531a Merge branch 'for-upstream' of git://github.com/agraf/linux-2.6 into next) Merging kvm-ppc/kvm-ppc-next (555b092 KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.) Merging oprofile/for-next (c16fa4f Linux 3.3) Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) Merging xen-two/linux-next (6999aef Revert "Merge branch 'stable/for-linus-3.5' into linux-next") Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) Merging workqueues/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) Merging drivers-x86/linux-next (d0e0a477 dell-laptop: Add touchpad led support for Dell V3450) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) Merging regmap/for-next (f2d60fd Merge tag 'regmap-3.5' into regmap-next) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) Merging leds/for-next (90b175c led: add oneshot trigger) Merging driver-core/driver-core-next (bdd4034 driver core: always handle dpm_order) Merging tty/tty-next (4a055c9 Delete generic_serial.h) Merging usb/usb-next (cfaf025 Linux 3.5-rc2) Merging staging/staging-next (4bfa9b2 staging: comedi: das08: Reduce conditional compilation) Merging char-misc/char-misc-next (cfaf025 Linux 3.5-rc2) Merging tmem/linux-next (cfaf025 Linux 3.5-rc2) Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors) 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 (d3b77c1 pinctrl: add pinctrl_add_gpio_ranges function) Merging moduleh/for-sfr (f9e1b2b tile: fix compile failure on start_kernel in setup.c) Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support) Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal) Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) Merging remoteproc/for-next (d48b97b Linux 3.4-rc6) Merging irqdomain/irqdomain/next (a87487e irqdomain: Document size parameter of irq_domain_add_linear()) Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly) Merging arm-soc/for-next (a984d37 Merge branch 'next/drivers' into for-next) Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep93xx-for-next) Merging renesas/next (76ab1e9 Merge branch 'renesas-emev2' into renesas-next) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig Merging s5p/for-next (cfaf025 Linux 3.5-rc2) Merging tegra/for-next (fe929bf Merge branch 'for-3.6/defconfig' into for-next) Merging kvmtool/master (41584b1 kvm tools: Use safe string handling functions) Merging dma-mapping/dma-mapping-next (7a77754 Merge commit 'd5106e4' into dma-mapping-next) Merging dma-buf/for-next (b48b2c3 openrisc: use generic strnlen_user() function) Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs) Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS) Merging signal/for-next (57760eb Uninclude linux/freezer.h) Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: selinux: fix something Applying: CMA: mo no enable it by default Applying: tmpfs: implement NUMA node interleaving Applying: tmpfs-implement-numa-node-interleaving-fix Applying: cciss: fix incorrect scsi status reporting Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver Applying: arch/x86/include/asm/spinlock.h: fix comment Applying: timeconst.pl: remove deprecated defined(@array) Applying: time: don't inline EXPORT_SYMBOL functions Applying: ocfs2: use find_last_bit() Applying: ocfs2: use bitmap_weight() Applying: drivers/scsi/ufs: use module_pci_driver Applying: drivers/scsi/ufs: reverse the ufshcd_is_device_present logic Applying: drivers/scsi/ufs: fix incorrect return value about SUCCESS and FAILED Applying: drivers/scsi/atp870u.c: fix bad use of udelay Applying: vfs: increment iversion when a file is truncated Applying: fs: symlink restrictions on sticky directories Applying: fs: hardlink creation restrictions Applying: mm/slab: remove duplicate check Applying: slab: move FULL state transition to an initcall Applying: vmalloc: walk vmap_areas by sorted list instead of rb_next() Applying: mm: make vb_alloc() more foolproof Applying: mm-make-vb_alloc-more-foolproof-fix Applying: memcg: rename MEM_CGROUP_STAT_SWAPOUT as MEM_CGROUP_STAT_SWAP Applying: memcg: rename MEM_CGROUP_CHARGE_TYPE_MAPPED as MEM_CGROUP_CHARGE_TYPE_ANON Applying: memcg: remove MEM_CGROUP_CHARGE_TYPE_FORCE Applying: swap: allow swap readahead to be merged Applying: documentation: update how page-cluster affects swap I/O Applying: hugetlb: rename max_hstate to hugetlb_max_hstate Applying: hugetlbfs: don't use ERR_PTR with VM_FAULT* values Applying: hugetlbfs: add an inline helper for finding hstate index Applying: hugetlbfs-add-an-inline-helper-for-finding-hstate-index-fix Applying: hugetlb: use mmu_gather instead of a temporary linked list for accumulating pages Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-fix Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2 Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb Applying: hugetlb: simplify migrate_huge_page() Applying: hugetlb-simplify-migrate_huge_page-fix Applying: memcg: add HugeTLB extension Applying: memcg-add-hugetlb-extension-fix Applying: memcg-add-hugetlb-extension-fix-fix Applying: hugetlb: add charge/uncharge calls for HugeTLB alloc/free Applying: memcg: track resource index in cftype private Applying: hugetlbfs: add memcg control files for hugetlbfs Applying: memcg: use scnprintf instead of sprintf Applying: hugetlbfs-add-memcg-control-files-for-hugetlbfs-use-scnprintf-instead-of-sprintf-fix Applying: memcg/hugetlb: Add failcnt support for hugetlb extension Applying: hugetlbfs: add a list for tracking in-use HugeTLB pages Applying: memcg: move HugeTLB resource count to parent cgroup on memcg removal Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix Applying: memcg-move-hugetlb-resource-count-to-parent-cgroup-on-memcg-removal-fix-fix Applying: hugetlb: migrate memcg info from oldpage to new page during migration Applying: hugetlb-migrate-memcg-info-from-oldpage-to-new-page-during-migration-fix Applying: hugetlb-use-mmu_gather-instead-of-a-temporary-linked-list-for-accumulating-pages-fix-2 Applying: memcg: add memory controller documentation for hugetlb management Applying: memcg: fix error code in hugetlb_force_memcg_empty() Applying: memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2 Applying: memcg-fix-error-code-in-hugetlb_force_memcg_empty-v2-checkpatch-fixes Applying: memcg: use res_counter_uncharge_until() in mem_cgroup_move_hugetlb_parent() Applying: memcg: move charges to root cgroup if use_hierarchy=0 in mem_cgroup_move_hugetlb_parent() Applying: clk: add non CONFIG_HAVE_CLK routines Applying: clk: remove redundant depends on from drivers/Kconfig Applying: i2c/i2c-pxa: remove conditional compilation of clk code Applying: usb/marvell: remove conditional compilation of clk code Applying: usb/musb: remove conditional compilation of clk code Applying: ata/pata_arasan: remove conditional compilation of clk code Applying: net/c_can: remove conditional compilation of clk code Applying: net/stmmac: remove conditional compilation of clk code CONFLICT (content): Merge conflict in drivers/net/ethernet/stmicro/stmmac/stmmac.h Applying: gadget/m66592: remove conditional compilation of clk code Applying: gadget/r8a66597: remove conditional compilation of clk code Applying: usb/host/r8a66597: remove conditional compilation of clk code Applying: NMI watchdog: fix for lockup detector breakage on resume Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix-fix Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-fix-fix Applying: watchdog: fix for lockup detector breakage on resume Applying: nmi-watchdog-fix-for-lockup-detector-breakage-on-resume-v2-fix Applying: kmsg: /dev/kmsg - properly return possible copy_from_user() failure Applying: ipc/sem.c: alternatives to preempt_disable() Applying: c/r: fcntl: add F_GETOWNER_UIDS option Applying: notify_change(): check that i_mutex is held Merging quilt/akpm (34f156e notify_change(): check that i_mutex is held) Applying: sparc/PCI: fix typo
Attachment:
pgpyUyKFBbzDj.pgp
Description: PGP signature
