Hi all, Happy New Year! Changes since 20111228: The arm-soc tree gained a conflict against the arm tree. The s5p tree gained a build failure so I used the version from next-20111228. The ext3 tree lost its build failure. The ext4 tree gained a build failure for which I applied a patch. The xfs tree gained a conflict against Linus' tree. The vfs tree lost its build failure but gained another for which I applied a patch. The wireless-next tree still has its build failure. The l2-mtd tree gained a conflict against the logfs tree. The input tree gained a conflict against the arm-soc tree. The gpio tree gained a conflict against the devicetree tree. The tip tree gained conflicts against Linus' tree. The driver-core tree still has its build failure so I used the version from next-20111222. The akpm tree lost 2 patches that turned up elsewhere. ---------------------------------------------------------------------------- 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 206 trees (counting Linus' and 28 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 (115e8e7 Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6) Merging fixes/master (371de6e drm/i915: Disable RC6 on Sandybridge by default) Merging kbuild-current/rc-fixes (fa0ad65 kconfig: adapt update-po-config to new UML layout) Merging arm-current/fixes (abb959f ARM: 7237/1: PL330: Fix driver freeze) Merging m68k-current/for-linus (5bf1e97 m68k: Wire up process_vm_{read,write}v) Merging powerpc-merge/merge (49e4406 powerpc/44x: Add mtd ndfc to the ppx44x defconfig) Merging 52xx-and-virtex-current/powerpc/merge (c49f878 dtc/powerpc: remove obsolete .gitignore entries) Merging sparc/master (7cc8583 sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().) 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 (733bbb7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging sound-current/for-linus (8015e3d ALSA: atmel/ac97c: using software reset instead hardware reset if not available) Merging pci-current/for-linus (b51306c PCI: Set device power state to PCI_D0 for device without native PM support) Merging wireless/master (96f1f05 iwlwifi: update SCD BC table for all SCD queues) Merging driver-core.current/driver-core-linus (dc47ce9 Linux 3.2-rc5) Merging tty.current/tty-linus (384703b Linux 3.2-rc6) Merging usb.current/usb-linus (5f0a6e2 Linux 3.2-rc7) Merging staging.current/staging-linus (384703b Linux 3.2-rc6) Merging char-misc.current/char-misc-linus (384703b Linux 3.2-rc6) Merging cpufreq-current/fixes (5983fe2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging input-current/for-linus (6ccbcf2 Input: sentelic - fix retrieving number of buttons) Merging md-current/for-linus (961902c md/bitmap: It is OK to clear bits during recovery.) Merging audit-current/for-linus (def5754 Audit: remove spaces from audit_log_d_path) Merging crypto-current/master (2742528 crypto: mv_cesa - fix hashing of chunks > 1920 bytes) Merging ide/master (0ab3d8b cy82c693: fix PCI device selection) Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6) Merging sh-current/sh-fixes-for-linus (21d41f2 sh: fix the compile error in setup-sh7757.c) Merging rmobile-current/rmobile-fixes-for-linus (a408bae ARM: mach-shmobile: sh7372 CMT3 and CMT4 clock support) Merging devicetree-current/devicetree/merge (f88e1ae dt/device: Fix auxdata matching to handle entries without a name override) Merging spi-current/spi/merge (178db7d spi: Fix device unregistration when unregistering the bus master) Merging gpio-current/gpio/merge (87b9b0e gpio: Fix DA9052 GPIO build errors.) Merging arm/for-next (87646a0 Merge branch 'restart' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-kota2.c Merging arm-soc/for-next (a107032 Merge branches 'next/fixes-non-critical', 'next/drivers' and 'next/boards' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-tegra/common.c CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-dt-tegra20.c CONFLICT (modify/delete): arch/arm/mach-s5pv210/init.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/mach-s5pv210/init.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-s5pv210/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-s5pc100/Makefile CONFLICT (modify/delete): arch/arm/mach-s5p64x0/init.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/mach-s5p64x0/init.c left in tree. CONFLICT (modify/delete): arch/arm/mach-s5p64x0/cpu.c deleted in HEAD and modified in arm-soc/for-next. Version arm-soc/for-next of arch/arm/mach-s5p64x0/cpu.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-ti8168evm.c CONFLICT (content): Merge conflict in arch/arm/mach-mxs/include/mach/common.h CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9rl.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9g45.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9261.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9260.c CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91cap9.c $ git rm -f arch/arm/mach-s5p64x0/cpu.c arch/arm/mach-s5p64x0/init.c arch/arm/mach-s5pv210/init.c Merging arm-perf/for-next/perf (dc47ce9 Linux 3.2-rc5) Merging at91/at91-next (8748dfa Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux) Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) Merging i.MX/for-next (5788f4d Merge branches 'imx-fixes', 'imx-cleanup' and 'imx-features' into master) CONFLICT (content): Merge conflict in arch/arm/plat-mxc/include/mach/hardware.h CONFLICT (modify/delete): arch/arm/mach-mx5/pm-imx5.c deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/pm-imx5.c left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Makefile deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Makefile left in tree. CONFLICT (modify/delete): arch/arm/mach-mx5/Kconfig deleted in HEAD and modified in i.MX/for-next. Version i.MX/for-next of arch/arm/mach-mx5/Kconfig left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-imx/mm-imx5.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/devices-imx53.h CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-mx51-mx53.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/clock-imx35.c $ git rm -f arch/arm/mach-mx5/pm-imx5.c arch/arm/mach-mx5/Makefile arch/arm/mach-mx5/Kconfig Merging linux-spec/for-next (5111711 Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux) Merging omap/for-next (322a8b0 Linux 3.1-rc1) Merging pxa/for-next (19d6c13 [ARM] pxa/hx4700: actually use platform_lcd driver) Merging samsung/next-samsung (9edb240 ARM: H1940/RX1950: Change default LED triggers) Merging tegra/for-next (bdd01cc Merge branch 'for-3.3/dt' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-harmony-pcie.c Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support) Merging blackfin/for-linus (13fc35b blackfin: mac: dsa: add vlan mask in board file) Merging c6x/for-linux-next (2141355 C6X: MAINTAINERS) 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) Merging ia64/next (2174f6d pstore: gracefully handle NULL pstore_info functions) Merging m68k/for-next (176f293 m68k/serial: Remove references to obsolete serial config options) Merging m68knommu/for-next (1f7034b m68k: allow ColdFire 547x and 548x CPUs to be built with MMU enabled) CONFLICT (content): Merge conflict in arch/m68k/Kconfig.debug Merging microblaze/next (7f80850 Merge branch 'rmobile-fixes-for-linus' of git://github.com/pmundt/linux-sh) Merging mips/mips-for-linux-next (1fc140c Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next) CONFLICT (content): Merge conflict in arch/mips/kernel/perf_event_mipsxx.c 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 (3f53638 powerpc: Fix old bug in prom_init setting of the color) Merging 4xx/next (eba3d97 powerpc/boot: Change the WARN to INFO for boot wrapper overlap message) Merging 52xx-and-virtex/powerpc/next (c1395f4 dtc/powerpc: remove obsolete .gitignore entries) Merging galak/next (fa8cbaa powerpc+sparc64/mm: Remove hack in mmap randomize layout) Merging s390/features (2fa1d4f [S390] disassembler: mark exception causing instructions) Merging sh/sh-latest (b9a3acf Merge branch 'sh/stable-updates' into sh-latest) Merging rmobile/rmobile-latest (b58c580 Merge branch 'rmobile-fixes-for-linus' into rmobile-latest) Merging sparc-next/master (6e4d177 sparc32: remove unused file: include/asm/pgtsun4.h) Merging tile/master (0c90547 arch/tile: use new generic {enable,disable}_percpu_irq() routines) Merging unicore32/unicore32 (fa2f576 rtc-puv3: solve section mismatch in rtc-puv3.c) Merging xtensa/master (29aced6 xtensa: remove defining register numbers) Merging ceph/for-next (3395734 libceph: fix double-free of page vector) Merging cifs/master (8def5f5 Merge git://git.samba.org/sfrench/cifs-2.6) 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 (7e6aad6 eCryptfs: Improve statfs reporting) Merging ext3/for_next (1f2b915 udf: Mark LVID buffer as uptodate before marking it dirty) Merging ext4/dev (10fd164 ext4: use proper little-endian bitops) Applying: jbd2: sanitize a new global symbol (journal_clear_buffer_revoked_flags) Merging fatfs/master (710d440 fat: fat16 support maximum 4GB file/vol size as WinXP or 7.) Merging fuse/for-next (03c9693 cuse: implement memory mapping) Merging gfs2/master (46cc1e5 GFS2: local functions should be static) Merging hfsplus/for-next (6596528 hfsplus: ensure bio requests are not smaller than the hardware sectors) Merging jfs/next (1c8007b jfs: flush journal completely before releasing metadata inodes) Merging logfs/master (21f3eb8 logfs: update page reference count for pined pages) CONFLICT (content): Merge conflict in fs/logfs/file.c Merging nfs/linux-next (08d3ca8 NFS: handle NFS idmap pipe PipeFS dentries by network namespace aware routines) Merging nfsd/nfsd-next (f32f3c2 nfsd4: initialize special stateid's at compile time) Merging nilfs2/for-next (93ee7a9 Linux 3.1-rc2) Merging ocfs2/linux-next (9392557 ocfs2: avoid unaligned access to dqc_bitmap) Merging omfs/for-next (976d167 Linux 3.1-rc9) Merging squashfs/master (d7fbd89 Squashfs: optimise squashfs_cache_get entry search) Merging v9fs/for-next (883381d Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) Merging ubifs/linux-next (eaecf43 UBIFS: Use kmemdup rather than duplicating its implementation) Merging xfs/master (40d344e xfs: mark the xfssyncd workqueue as non-reentrant) CONFLICT (content): Merge conflict in fs/xfs/xfs_sync.c Merging vfs/for-next (20e3378 vfs: prevent remount read-only if pending removes) CONFLICT (content): Merge conflict in fs/ext4/ioctl.c Applying: sysreq.c needs uaccess.h for get_user Applying: fs: make put_super global again Merging vfs-scale/vfs-scale-working (32385c7 kernel: fix hlist_bl again) Merging pci/linux-next (770aed2 PCI: kconfig: English typo in pci/pcie/Kconfig) Merging hid/for-next (e25d980 Merge branch 'multitouch' into for-next) Merging quilt/i2c (a682833 i2c-ali1535: enable SPARC support) Merging bjdooks-i2c/next-i2c (f8420b7 fixup merge) CONFLICT (add/add): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c Merging quilt/jdelvare-hwmon (4a96f1a hwmon: (coretemp) Add missing section annotations) Merging hwmon-staging/hwmon-next (6131996 hwmon: (f75375s) Add support for F75387SG/RG) Merging quilt/kernel-doc (c3b92c8 Linux 3.1) Merging docs/docs-move (5c24d8b Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move) Merging v4l-dvb/master (c4f6fc6 Merge /home/v4l/v4l/patchwork) Merging kbuild/for-next (c1bc213 Merge branch 'kbuild/rc-fixes' into kbuild/for-next) Merging kconfig/for-next (eae1c36 Merge branch 'kconfig/for-linus-2' into kconfig/for-next) Merging libata/NEXT (e280234 ata: add ata port hibernate callbacks) Merging infiniband/for-next (480390c Merge branches 'cma', 'mlx4' and 'qib' into for-next) Merging acpi/next (efb9058 Merge branches 'acpi', 'idle', 'mrst-pmu' and 'pm-tools' into next) Merging cpupowerutils/master (498ca79 cpupower: use man(1) when calling "cpupower help subcommand") Merging ieee1394/for-next (2ca526b MAINTAINERS: firewire git URL update) Merging ubi/linux-next (c55d743 UBI: fix missing scrub when there is a bit-flip) Merging dlm/next (5cb6a10 gfs2: dlm based recovery coordination) Merging scsi/master (5c41dc3 [SCSI] lpfc 8.3.28: Update driver version to 8.3.28) 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 (e9f3a49 dmaengine/ste_dma40: clear LNK on channel startup) CONFLICT (content): Merge conflict in drivers/dma/pl330.c CONFLICT (content): Merge conflict in drivers/dma/Kconfig Merging async_tx/next (21ef4b8 dmaengine: use DEFINE_IDR for static initialization) Merging net-next/master (3ab0b24 netfilter: nfnetlink_acct: fix nfnl_acct_get operation) Merging wireless-next/master (dc0d633 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next) CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c CONFLICT (content): Merge conflict in drivers/net/wireless/b43/dma.c [master 2040e44] Revert "ath6kl: enable USB support" Merging bluetooth/master (9219b2a Bluetooth: Fix bacpy in l2cap_core.c) Merging mtd/master (c329879 mtd: plat_ram: call mtd_device_register only if partition data exists) Merging l2-mtd/master (20a8144 mtd: do not use mtd->block_markbad directly) CONFLICT (content): Merge conflict in fs/logfs/dev_mtd.c Merging crypto/master (08c70fc crypto: gf128mul - remove leftover "(EXPERIMENTAL)" in Kconfig) Merging sound/for-next (192d935 Merge branch 'topic/misc' into for-next) CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c Merging sound-asoc/for-next (34be924 ASoC: pxa: Convert corgi to use snd_soc_register_card()) Merging cpufreq/next (21f2e3c [CPUFREQ] Remove wall variable from cpufreq_gov_dbs_init()) Merging quilt/rr (91aaf56 module_param: make bool parameters really bool (drivers & misc)) CONFLICT (content): Merge conflict in scripts/mod/file2alias.c CONFLICT (content): Merge conflict in drivers/net/virtio_net.c Merging input/next (ee9dfd7 Input: psmouse - make sure we do not use stale methods) CONFLICT (content): Merge conflict in drivers/input/keyboard/samsung-keypad.c Merging input-mt/next (02f8c6a Linux 3.0) Merging lsm/for-next (ca05a99 capabilities: remain source compatible with 32-bit raw legacy capability support.) Merging block/for-next (cc0cd96 Merge branch 'for-3.3/core' into for-next) Merging quilt/device-mapper (ecefc36 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) Merging pcmcia/master (74411c0 smc91c92_cs.c: fix bogus compiler warning) Merging battery/master (00a159a max8925_power: Check at probe time if power to set online) Merging mmc/mmc-next (6f45d1c mmc: omap: remove clock rate hard coding) CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pci.c CONFLICT (content): Merge conflict in drivers/mmc/card/block.c Merging kgdb/kgdb-next (880ba69 lib: rename pack_hex_byte() to hex_byte_pack()) Merging slab/for-next (a1450d6 Merge branch 'slab/urgent' into for-next) Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**") Merging md/for-next (19d6716 md/raid1: Mark device want_replacement when we see a write error.) Merging mfd/for-next (ad62289 mfd: Improve mc13xxx dt binding document) CONFLICT (content): Merge conflict in scripts/mod/file2alias.c Merging hdlc/hdlc-next (4a6908a Linux 2.6.28) Merging drm/drm-next (5c2a5ce drm: add missing exports for i810 driver.) CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_kms.c CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen.c Merging fbdev/fbdev-next (56bba8c fbdev: matroxfb: Fix compilation after fb_var_screeninfo change) CONFLICT (content): Merge conflict in drivers/video/i810/i810_main.c Merging viafb/viafb-next (4ce36bb viafb: replace strict_strtoul to kstrto* and check return value) Merging omap_dss2/for-next (7282f1b OMAPDSS: DISPC: Update Scaling Clock Logic) Merging regulator/for-next (1bb50b2 regulator: pass regulator_register of_node in fixed voltage driver) Merging security/next (7b7e591 ima: fix invalid memory reference) CONFLICT (content): Merge conflict in security/integrity/evm/evm_crypto.c CONFLICT (content): Merge conflict in lib/Makefile Merging selinux/master (ded5098 SELinux: skip file_name_trans_write() when policy downgraded.) Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) Merging watchdog/linux-next (edc804e watchdog: new driver for VIA chipsets) Merging bdev/master (feaf384 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block) Merging dwmw2-iommu/master (c3b92c8 Linux 3.1) Merging iommu/next (f4e8a3c Merge branches 'iommu/fixes', 'arm/omap', 'x86/amd', 'iommu/page-sizes' and 'iommu/group-id' into next) CONFLICT (content): Merge conflict in include/linux/pci_regs.h CONFLICT (content): Merge conflict in drivers/pci/hotplug/acpiphp_glue.c Merging osd/linux-next (dde406e pnfs-obj: Support for RAID5 read-4-write interface.) Merging jc_docs/docs-next (5c050fb docs: update the development process document) Merging nommu/master (0ce790e Linux 2.6.39-rc1) Merging trivial/for-next (d36b691 misc latin1 to utf8 conversions) CONFLICT (content): Merge conflict in arch/powerpc/platforms/40x/Kconfig Merging audit/for-next (def5754 Audit: remove spaces from audit_log_d_path) Merging pm/linux-next (a9588c9 PM / Hibernate: Implement compat_ioctl for /dev/snapshot) CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c Merging apm/for-next (282e5aa x86: Kconfig: drop unknown symbol 'APM_MODULE') Merging fsnotify/for-next (ef9bf3b fanotify: only destroy a mark if both its mask and its ignored_mask are cleared) Merging irda/for-next (94d57c4 enic: Update MAINTAINERS) 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 (93797d8 irq: check domain hwirq range for DT translate) Merging spi/spi/next (2b24628 spi-topcliff-pch: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor) Merging gpio/gpio/next (d0ad5e8 gpio: Add decode of WM8994 GPIO configuration) CONFLICT (content): Merge conflict in include/linux/of.h Merging tip/auto-latest (e52a753 Merge branch 'x86/apic' into auto-latest) CONFLICT (content): Merge conflict in kernel/futex.c CONFLICT (content): Merge conflict in include/asm-generic/cputime.h CONFLICT (content): Merge conflict in arch/powerpc/include/asm/cputime.h CONFLICT (content): Merge conflict in arch/ia64/include/asm/cputime.h CONFLICT (content): Merge conflict in arch/arm/mm/init.c Merging rcu/rcu/next (2d5a09c sched: Add "const" to is_idle_task() parameter) Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) Merging uprobes/for-next (1b46788 perf: perf interface for uprobes) Applying: uprobes: bad merge fix Merging cgroup/for-next (ef74efb Merge branch 'for-3.3' into for-next) CONFLICT (content): Merge conflict in block/blk-cgroup.c Merging kmemleak/kmemleak (029aeff kmemleak: Add support for memory hotplug) Merging kvm/kvm-updates/3.3 (da69dee KVM: PPC: Whitespace fix for kvm.h) CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c Merging oprofile/for-next (42fcb11 Merge branch 'oprofile/perf-ibs-v4' into oprofile/for-next) Merging xen/upstream/xen (ec8161f Merge branch 'upstream/microcode' into upstream/xen) CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig Merging xen-two/linux-next (5821410 xen/xenbus: Fix compile error - missing header for xen_initial_domain()) CONFLICT (content): Merge conflict in arch/x86/xen/Kconfig Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) Merging percpu/for-next (9f57bd4 percpu: fix per_cpu_ptr_to_phys() handling of non-page-aligned addresses) Merging workqueues/for-next (933393f percpu: Remove irqsafe_cpu_xxx variants) CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h Merging sfi/sfi-test (5b026c4 SFI: use ioremap_cache() instead of ioremap()) Merging asm-generic/next (35dbc0e asm-generic/io.h: allow people to override individual funcs) Merging drivers-x86/linux-next (15b956a acer-wmi: support Lenovo ideapad S205 wifi switch) Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) Merging sysctl/master (c2f5631 sysctl: remove impossible condition check) Merging namespace/master (7e05c93 proc: Fix the proc access checks to namespace files.) Merging regmap/for-next (d9cba48 mfd: Fix annotations in da9052-core) CONFLICT (content): Merge conflict in drivers/base/regmap/regmap.c CONFLICT (content): Merge conflict in drivers/base/regmap/regcache.c Merging hsi/for-next (a8b4dea HSI: hsi_char: Update ioctl-number.txt) Merging driver-core/driver-core-next (a87b5b1 arm: time.h: remove device.h #include) CONFLICT (content): Merge conflict in include/linux/cpu.h CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/sysfs.c CONFLICT (content): Merge conflict in arch/arm/plat-samsung/include/plat/cpu.h CONFLICT (content): Merge conflict in arch/arm/mach-s5pv210/common.c CONFLICT (modify/delete): arch/arm/mach-s5p64x0/cpu.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of arch/arm/mach-s5p64x0/cpu.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/s3c6400.c CONFLICT (modify/delete): arch/arm/mach-s3c64xx/cpu.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of arch/arm/mach-s3c64xx/cpu.c left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/common.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c2440/clock.c CONFLICT (content): Merge conflict in arch/arm/mach-exynos/cpu.c $ git rm -f arch/arm/mach-s3c64xx/cpu.c arch/arm/mach-s5p64x0/cpu.c Applying: s390: fixup for sysdev removal $ git reset --hard HEAD^ Merging refs/next/20111222/driver-core Merging tty/tty-next (6485163 serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.) CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig Merging usb/usb-next (1b41c83 usbfs: Fix oops related to user namespace conversion.) Merging staging/staging-next (3b148be staging/rtl8192e: Register against lib80211) CONFLICT (modify/delete): drivers/staging/spectra/lld_mtd.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/spectra/lld_mtd.c left in tree. CONFLICT (content): Merge conflict in drivers/staging/iio/adc/ad799x_core.c CONFLICT (content): Merge conflict in drivers/staging/hv/Makefile CONFLICT (content): Merge conflict in drivers/staging/hv/Kconfig CONFLICT (rename/delete): drivers/hid/hid-hyperv.c deleted in staging/staging-next and renamed in HEAD. Version HEAD of drivers/hid/hid-hyperv.c left in tree. $ git rm -f drivers/staging/spectra/lld_mtd.c Merging s5p/for-next (44ceab1 Merge branch 'driver-core-next' into for-next-new) CONFLICT (content): Merge conflict in include/linux/cpu.h CONFLICT (content): Merge conflict in drivers/dma/pl330.c CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c CONFLICT (content): Merge conflict in arch/powerpc/kernel/sysfs.c CONFLICT (content): Merge conflict in arch/arm/plat-samsung/include/plat/system-reset.h CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/include/mach/system.h CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/include/mach/crag6410.h CONFLICT (modify/delete): arch/arm/mach-s3c2410/include/mach/system-reset.h deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-s3c2410/include/mach/system-reset.h left in tree. CONFLICT (content): Merge conflict in arch/arm/mach-exynos/include/mach/entry-macro.S CONFLICT (modify/delete): arch/arm/mach-exynos/cpu.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/mach-exynos/cpu.c left in tree. CONFLICT (modify/delete): arch/arm/common/pl330.c deleted in s5p/for-next and modified in HEAD. Version HEAD of arch/arm/common/pl330.c left in tree. $ git reset --hard HEAD^ Merging refs/next/20111228/s5p CONFLICT (content): Merge conflict in drivers/dma/pl330.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-crag6410.c CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile CONFLICT (modify/delete): arch/arm/common/pl330.c deleted in refs/next/20111228/s5p and modified in HEAD. Version HEAD of arch/arm/common/pl330.c left in tree. $ git rm -f arch/arm/common/pl330.c [master 026a0aa] Merge commit 'refs/next/20111228/s5p' Merging char-misc/char-misc-next (1ff9764 char_dev.c: fix up some whitespace errors) Merging bkl-config/config (4ba8216 BKL: That's all, folks) Merging tmem/tmem (665c1e6 mm: cleancache: Use __read_mostly as appropiate.) CONFLICT (content): Merge conflict in mm/swapfile.c CONFLICT (content): Merge conflict in fs/buffer.c Applying: tmem: fix up for code movement Merging writeback/writeback-for-next (bdaac49 writeback: balanced_rate cannot exceed write bandwidth) 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 (0cedce8 pinctrl: some typo fixes) Merging moduleh/for-sfr (6aec187 drivers/media: video/a5k6aa is a module and so needs module.h) Merging vhost/linux-next (193a667 alpha: drop pci_iomap/pci_iounmap from pci-noop.c) CONFLICT (content): Merge conflict in arch/score/Kconfig CONFLICT (content): Merge conflict in arch/m68k/Kconfig CONFLICT (content): Merge conflict in arch/hexagon/Kconfig Merging kmap_atomic/kmap_atomic (7b8fa32 feature-removal-schedule.txt: add the deprecated form of kmap_atomic()) CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt Merging xshm/xshm-for-next (d12cdda caif-xshm: 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 (0be20f7 rpmsg: add Kconfig menu) Applying: rpmsg: rename virtqueue_add_buf_gfp to virtqueue_add_buf Merging kvmtool/master (6119b86 kvm tools: Use kvm_ipc__send to send IPC msg) CONFLICT (content): Merge conflict in scripts/kconfig/Makefile CONFLICT (content): Merge conflict in include/net/9p/9p.h Merging uapi/for-next (1632b9e UAPI: Split trivial #if defined(__KERNEL__) && X conditionals) Merging scsi-post-merge/merge-base:master () $ git checkout akpm Applying: net/netfilter/nf_conntrack_netlink.c: fix Oops on container destroy Applying: drivers/watchdog/hpwdt.c: mark page executable 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: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-fix Applying: x86-olpc-xo15-sci-enable-lid-close-wakeup-control-through-sysfs-v2 Applying: mm/vmalloc.c: eliminate extra loop in pcpu_get_vm_areas error path Applying: mm-vmallocc-eliminate-extra-loop-in-pcpu_get_vm_areas-error-path-fix Applying: x86, olpc: add debugfs interface for EC commands Applying: drivers/platform/x86/sony-laptop.c: fix scancodes Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-checkpatch-fixes Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2 Applying: drivers-platform-x86-sony-laptopc-fix-scancodes-v2-checkpatch-fixes Applying: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file Applying: arm, exec: remove redundant set_fs(USER_DS) Applying: hrtimers: Special-case zero length sleeps Applying: tick-sched: add specific do_timer_cpu value for nohz off mode Applying: ia64, exec: remove redundant set_fs(USER_DS) Applying: kconfig: add merge_config.sh script Applying: merge_config.sh: use signal names compatible with dash and bash Applying: merge_config.sh: whitespace cleanup Applying: merge_config.sh: fix bug in final check Applying: ipc/mqueue: cleanup definition names and locations Applying: ipc/mqueue: switch back to using non-max values on create Applying: ipc/mqueue: enforce hard limits Applying: ipc/mqueue: update maximums for the mqueue subsystem Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-fix Applying: ipc-mqueue-update-maximums-for-the-mqueue-subsystem-checkpatch-fixes Applying: debugobjects: Fix selftest for static warnings Applying: parisc, exec: remove redundant set_fs(USER_DS) Applying: scsi: fix a header to include linux/types.h Applying: drivers/scsi/megaraid.c: fix sparse warnings Applying: drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb() Applying: drivers/scsi/sg.c: convert to kstrtoul_from_user() Applying: drivers/scsi/mpt2sas/mpt2sas_base.c: fix mismatch in mpt2sas_base_hard_reset_handler() mutex lock-unlock Applying: fs: remove unneeded plug in mpage_readpages() Applying: MAINTAINERS: Staging: cx25821: Add L: linux-media Applying: slub: document setting min order with debug_guardpage_minorder > 0 Applying: slub-document-setting-min-order-with-debug_guardpage_minorder-0-checkpatch-fixes Applying: mm/page-writeback.c: make determine_dirtyable_memory static again Applying: vmscan: promote shared file mapped pages Applying: vmscan: activate executable pages after first usage Applying: mm: add free_hot_cold_page_list() helper Applying: mm-add-free_hot_cold_page_list-helper-v2 Applying: mm-add-free_hot_cold_page_list-helper-v3 Applying: mm: remove unused pagevec_free Applying: mm-tracepoint: rename page-free events Applying: mm-tracepoint: fix documentation and examples 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: mm: migrate: one less atomic operation Applying: mm: reduce the amount of work done when updating min_free_kbytes Applying: mm-reduce-the-amount-of-work-done-when-updating-min_free_kbytes-checkpatch-fixes Applying: mm: avoid livelock on !__GFP_FS allocations Applying: mm: account reaped page cache on inode cache pruning Applying: hugetlb: detect race upon page allocation failure during COW Applying: hugetlb: clarify hugetlb_instantiation_mutex usage Applying: mm/hugetlb.c: fix virtual address handling in hugetlb fault Applying: mm-hugetlbc-fix-virtual-address-handling-in-hugetlb-fault-fix Applying: kernel.h: add BUILD_BUG() macro Applying: kernel.h: Add BUILD_BUG() macro. Applying: mm: more intensive memory corruption debugging Applying: mm-more-intensive-memory-corruption-debug-fix Applying: PM/Hibernate: do not count debug pages as savable Applying: slub: min order when debug_guardpage_minorder > 0 Applying: fadvise: only initiate writeback for specified range with FADV_DONTNEED Applying: mm, debug: test for online nid when allocating on single node Applying: vmscan: add task name to warn_scan_unevictable() messages Applying: mm: exclude reserved pages from dirtyable memory Applying: mm-exclude-reserved-pages-from-dirtyable-memory-fix Applying: mm: writeback: cleanups in preparation for per-zone dirty limits Applying: mm: try to distribute dirty pages fairly across zones Applying: mm: filemap: pass __GFP_WRITE from grab_cache_page_write_begin() Applying: Btrfs: pass __GFP_WRITE for buffered write page allocations Applying: mm: compaction: push isolate search base of compact control one pfn ahead Applying: bootmem: micro optimize freeing pages in bulk Applying: mm: fix off-by-two in __zone_watermark_ok() Applying: mremap: enforce rmap src/dst vma ordering in case of vma_merge() succeeding in copy_vma() Applying: mremap-enforce-rmap-src-dst-vma-ordering-in-case-of-vma_merge-succeeding-in-copy_vma-update Applying: mm: simplify find_vma_prev() Applying: mm-simplify-find_vma_prev-fix Applying: mm: simplify find_vma_prev Applying: tracepoint: add tracepoints for debugging oom_score_adj Applying: mm: page_alloc: generalize order handling in __free_pages_bootmem() Applying: mm: bootmem: drop superfluous range check when freeing pages in bulk Applying: mm: bootmem: try harder to free pages in bulk Applying: mm/vmscan.c: consider swap space when deciding whether to continue reclaim Applying: mm: hugetlb: fix pgoff computation when unmapping page from vma Applying: mm-hugetlb-fix-pgoff-computation-when-unmapping-page-from-vma-fix Applying: mm/mempolicy.c: mpol_equal(): use bool Applying: mm/migrate.c: cleanup comment for migration_entry_wait() Applying: mempool: fix and document synchronization and memory barrier usage Applying: mempool: drop unnecessary and incorrect BUG_ON() from mempool_destroy() Applying: mempool: fix first round failure behavior Applying: mempool-fix-first-round-failure-behavior-fix Applying: hpet: factor timer allocate from open Applying: intel_idle: fix API misuse Applying: intel_idle: disable auto_demotion for hotplugged CPUs Applying: kernel.h: neaten panic prototype Applying: include/linux/linkage.h: remove unused NORET_AND macro Applying: treewide: remove useless NORET_TYPE macro and uses Applying: treewide: convert uses of ATTRIB_NORETURN to __noreturn Applying: treewide-convert-uses-of-attrib_noreturn-to-__noreturn-checkpatch-fixes Applying: include/linux/linkage.h: remove unused ATTRIB_NORET macro Applying: mm,slub,x86: decouple size of struct page from CONFIG_CMPXCHG_LOCAL Applying: mm,x86,um: move CMPXCHG_LOCAL config option Applying: mm,x86,um: move CMPXCHG_DOUBLE config option Applying: audit: always follow va_copy() with va_end() Applying: ceph, cifs, nfs, fuse: boolean and / or confusion Applying: pipe: fail cleanly when root tries F_SETPIPE_SZ with big size Applying: get_maintainers.pl: follow renames when looking up commit signers Applying: MAINTAINERS: update various arm F: patterns Applying: MAINTAINERS: update adp gpio F: patterns Applying: MAINTAINERS: update bt8xx gpio F: patterns Applying: MAINTAINERS: update marvell ccic F: patterns Applying: MAINTAINERS: update mfd F: patterns Applying: MAINTAINERS: update sdhci F: patterns Applying: MAINTAINERS: update tulip F: patterns Applying: MAINTAINERS: update greth F: patterns Applying: MAINTAINERS: update encrypted-keys F: patterns Applying: MAINTAINERS: staging: media: update F: patterns Applying: MAINTAINERS: serial:blackfin: update F: pattern Applying: MAINTAINERS: spi: update F: patterns Applying: devfreq: add devfreq maintainer entry Applying: backlight: remove ADX backlight device support Applying: backlight: convert drivers/video/backlight/* to use module_platform_driver() Applying: backlight/ld9040.c: regulator control in the driver Applying: drivers/video/backlight/ep93xx_bl.c: remove duplicated header include Applying: leds: convert led platform drivers to module_platform_driver Applying: leds: convert led i2c drivers to module_i2c_driver Applying: leds: convert leds-dac124s085 to module_spi_driver Applying: drivers/leds/leds-lp5523.c: remove unneeded forward declaration Applying: drivers/leds/leds-bd2802.c: use gpio_request_one() Applying: drivers/leds/leds-netxbig.c: use gpio_request_one() Applying: leds: add driver for TCA6507 LED controller Applying: drivers/leds/leds-mc13783.c: fix off-by-one for checking num_leds Applying: leds: convert wm831x status driver to devm_kzalloc() Applying: leds: convert wm8350 driver to devm_kzalloc() Applying: checkpatch: update signature "might be better as" warning Applying: checkpatch: prefer __printf over __attribute__((format(printf,...))) Applying: checkpatch: correctly track the end of preprocessor commands in context Applying: checkpatch: fix up complex macros context format Applying: checkpatch: check for common memset parameter issues against statments Applying: checkpatch: improve memset and min/max with cast checking Applying: checkpatch-improve-memset-and-min-max-with-cast-checking-fix Applying: checkpatch: ## is not a valid modifier Applying: checkpatch: optimise statement scanner when mid-statement Applying: checkpatch: only apply kconfig help checks for options which prompt Applying: checkpatch: fix EXPORT_SYMBOL handling following a function Applying: checkpatch: complex macro should allow the empty do while loop Applying: checkpatch: fix 'return is not a function' square bracket handling Applying: checkpatch: fix complex macros handling of square brackets Applying: checkpatch: ensure cast type is unique in the context parser Applying: checkpatch: typeof may have more complex arguments Applying: checkpatch: catch all occurences of type and cast spacing errors per line Applying: checkpatch-catch-all-occurances-of-type-and-cast-spacing-errors-per-line-checkpatch-fixes Applying: crc32: optimize inner loop Applying: epoll: limit paths Applying: fs: binfmt_elf: create Kconfig variable for PIE randomization Applying: MIPS: randomize PIE load address Applying: init/do_mounts.c: create /root if it does not exist Applying: drivers/rtc/rtc-cmos.c: fix broken NVRAM bank 2 writing Applying: drivers/rtc/rtc-mxc.c: fix setting time for MX1 SoC Applying: drivers-rtc-rtc-mxcc-fix-setting-time-for-mx1-soc-fix Applying: drivers/rtc/rtc-mxc.c: make alarm work Applying: drivers-rtc-rtc-mxcc-make-alarm-work-fix Applying: rtc/ab8500: don't disable IRQ:s when suspending Applying: rtc/ab8500: set can_wake flag Applying: drivers/rtc/rtc-ab8500.c: change msleep() to usleep_range() Applying: rtc/ab8500: add calibration attribute to AB8500 RTC Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-checkpatch-fixes Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3 Applying: rtc-ab8500-add-calibration-attribute-to-ab8500-rtc-v3-checkpatch-fixes Applying: drivers/rtc/rtc-wm831x.c: remove unused period IRQ handler Applying: drivers/rtc/rtc-wm831x.c: convert to devm_kzalloc() Applying: rtc: convert drivers/rtc/* to use module_platform_driver() Applying: drivers/rtc/rtc-mc13xxx.c: make mc13xxx_rtc_idtable static Applying: drivers/rtc/rtc-jz4740.c: make jz4740_rtc_driver static Applying: drivers/rtc/: remove redundant spi driver bus initialization Applying: reiserfs: delete comments refering to the BKL Applying: reiserfs: delay reiserfs lock until journal initialization Applying: reiserfs: don't lock journal_init() Applying: reiserfs: don't lock root inode searching Applying: cpusets, cgroups: disallow attaching kthreadd Applying: memcg: add mem_cgroup_replace_page_cache() to fix LRU issue Applying: mm: memcg: consolidate hierarchy iteration primitives Applying: mm: vmscan: distinguish global reclaim from global LRU scanning Applying: mm: vmscan: distinguish between memcg triggering reclaim and memcg being scanned Applying: mm-vmscan-distinguish-between-memcg-triggering-reclaim-and-memcg-being-scanned-checkpatch-fixes Applying: mm: memcg: per-priority per-zone hierarchy scan generations Applying: mm: move memcg hierarchy reclaim to generic reclaim code Applying: mm: memcg: remove optimization of keeping the root_mem_cgroup LRU lists empty Applying: mm: vmscan: convert global reclaim to per-memcg LRU lists Applying: mm: collect LRU list heads into struct lruvec Applying: mm: make per-memcg LRU lists exclusive Applying: mm: memcg: remove unused node/section info from pc->flags Applying: mm: memcg: remove unused node/section info from pc->flags fix Applying: memcg: make mem_cgroup_split_huge_fixup() more efficient Applying: memcg-make-mem_cgroup_split_huge_fixup-more-efficient-fix Applying: mm: memcg: shorten preempt-disabled section around event checks Applying: Documentation/cgroups/memory.txt: fix typo Applying: memcg: fix pgpgin/pgpgout documentation Applying: mm: oom_kill: remove memcg argument from oom_kill_task() Applying: mm: unify remaining mem_cont, mem, etc. variable names to memcg Applying: mm: memcg: clean up fault accounting Applying: mm: memcg: lookup_page_cgroup (almost) never returns NULL Applying: mm-memcg-lookup_page_cgroup-almost-never-returns-null fix Applying: mm: page_cgroup: check page_cgroup arrays in lookup_page_cgroup() only when necessary Applying: mm: memcg: remove unneeded checks from newpage_charge() Applying: mm: memcg: remove unneeded checks from uncharge_page() Applying: page_cgroup: add helper function to get swap_cgroup Applying: page_cgroup: cleanup lookup_swap_cgroup() Applying: memcg: free entries in soft_limit_tree if allocation fails Applying: oom, memcg: fix exclusion of memcg threads after they have detached their mm Applying: memcg: simplify page cache charging Applying: memcg: simplify corner case handling of LRU. Applying: memcg: clear pc->mem_cgorup if necessary. Applying: memcg-clear-pc-mem_cgorup-if-necessary-fix Applying: memcg-clear-pc-mem_cgorup-if-necessary-fix-2 Applying: memcg-clear-pc-mem_cgorup-if-necessary-fix-2-fix Applying: memcg-clear-pc-mem_cgorup-if-necessary-comments Applying: memcg-clear-pc-mem_cgorup-if-necessary fix 3 Applying: memcg: simplify LRU handling by new rule Applying: memcg-simplify-lru-handling-by-new-rule-fix Applying: memcg: return -EINTR at bypassing try_charge() Applying: memcg-simplify-lru-handling-by-new-rule-memcg-return-eintr-at-bypassing-try_charge-fix Applying: memcg: cleanup for_each_node_state() Applying: page_alloc: break early in check_for_regular_memory() Applying: page_cgroup: drop multi CONFIG_MEMORY_HOTPLUG Applying: thp: improve the error code path Applying: thp: remove unnecessary tlb flush for mprotect Applying: thp: add tlb_remove_pmd_tlb_entry Applying: thp: improve order in lru list for split huge page Applying: vmscan/trace: Add 'file' info to trace_mm_vmscan_lru_isolate() Applying: mm: compaction: allow compaction to isolate dirty pages Applying: mm: compaction: use synchronous compaction for /proc/sys/vm/compact_memory Applying: mm: vmscan: check if we isolated a compound page during lumpy scan Applying: mm: vmscan: do not OOM if aborting reclaim to start compaction Applying: mm: compaction: determine if dirty pages can be migrated without blocking within ->migratepage Applying: mm: compaction: make isolate_lru_page() filter-aware again Applying: mm: page allocator: do not call direct reclaim for THP allocations while compaction is deferred Applying: mm: compaction: introduce sync-light migration for use by compaction Applying: mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix Applying: mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix-fix Applying: mm-compaction-introduce-sync-light-migration-for-use-by-compaction-fix-fix-3 Applying: mm: vmscan: when reclaiming for compaction, ensure there are sufficient free pages available Applying: mm: vmscan: check if reclaim should really abort even if compaction_ready() is true for one zone Applying: mm: isolate pages for immediate reclaim on their own LRU Applying: mm: isolate pages for immediate reclaim on their own LRU fix Applying: mm-isolate-pages-for-immediate-reclaim-on-their-own-lru-fix-2 Applying: procfs: make proc_get_link to use dentry instead of inode Applying: procfs: introduce the /proc/<pid>/map_files/ directory Applying: procfs-introduce-the-proc-pid-map_files-directory-checkpatch-fixes Applying: fs: proc -- Make /proc/<pid>/map_files being CHECKPOINT_RESTORE dependent Applying: procfs: parse mount options Applying: procfs: add hidepid= and gid= mount options Applying: procfs: remove superfluous debug output Applying: proc: fix task_struct memleak Applying: workqueue: make alloc_workqueue() take printf fmt and args for name Applying: workqueue-make-alloc_workqueue-take-printf-fmt-and-args-for-name-fix Applying: cpumask: update setup_node_to_cpumask_map() comments Applying: kexec: remove KMSG_DUMP_KEXEC Applying: kdump: add missing RAM resource in crash_shrink_memory() Applying: kdump: add udev events for memory online/offline Applying: kdump: crashk_res init check for /sys/kernel/kexec_crash_size Applying: kdump: fix crash_kexec()/smp_send_stop() race in panic() Applying: ipc/mqueue: simplify reading msgqueue limit Applying: ipc/sem.c: alternatives to preempt_disable() Applying: ipc: provide generic compat versions of IPC syscalls Applying: sysctl: add the kernel.ns_last_pid control Applying: user namespace: make signal.c respect user namespaces Applying: __send_signal: pass q->info, not info, to userns_fixup_signal_uid (v2) Applying: ipc/mqueue: lock() => unlock() typo Applying: panic: don't print redundant backtraces on oops Applying: panic-dont-print-redundant-backtraces-on-oops-fix Applying: drivers/memstick: use kmemdup rather than duplicating its implementation Applying: fs/direct-io.c: calculate fs_count correctly in get_more_blocks() Applying: vfs: cache request_queue in struct block_device Applying: dio: optimize cache misses in the submission path Applying: dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes Applying: dio: using prefetch requires including prefetch.h Applying: radix_tree: remove radix_tree_indirect_to_ptr() Applying: radix_tree: take radix_tree_path off stack Applying: radix_tree: expand comment on optimization Applying: c/r: introduce CHECKPOINT_RESTORE symbol Applying: c/r: procfs: add start_data, end_data, start_brk members to /proc/$pid/stat v4 Applying: c-r-procfs-add-start_data-end_data-start_brk-members-to-proc-pid-stat-v4-fix Applying: c/r: prctl: add PR_SET_MM codes to set up mm_struct entries Applying: c-r-prctl-add-pr_set_mm-codes-to-set-up-mm_struct-entries-fix Applying: ramoops: fix use of rounddown_pow_of_two() Applying: ramoops: update parameters only after successful init Applying: unlzo: Fix input buffer free Applying: notify_change(): check that i_mutex is held Merging akpm (b5af2ea notify_change(): check that i_mutex is held)
Attachment:
pgpxdXT4SaTGf.pgp
Description: PGP signature
