* Re: linux-next: build warning after merge of the pci tree
From: Yinghai Lu @ 2012-05-01 7:35 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Bjorn Helgaas, linux-next, linux-kernel
In-Reply-To: <20120501160838.0bc75873705d84625d1fb98b@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
On Mon, Apr 30, 2012 at 11:08 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Bjorn,
>
> After merging the pci tree, today's linux-next build (i386 defconfig)
> produced this warning:
>
> arch/x86/pci/amd_bus.c: In function 'early_fill_mp_bus_info':
> arch/x86/pci/amd_bus.c:56:6: warning: unused variable 'j' [-Wunused-variable]
>
> Introduced by commit d28e5ac2a07e ("x86/PCI: dynamically allocate
> pci_root_info for native host bridge drivers").
>
please check attached patch.
Thanks
Yinghai
[-- Attachment #2: amd_bus_warning.patch --]
[-- Type: application/octet-stream, Size: 1361 bytes --]
Subject: [PATCH] PCI/x86: Fix unused warning with amd_bus
Have separated function for that.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
diff --git a/arch/x86/pci/amd_bus.c b/arch/x86/pci/amd_bus.c
index 459a731..5aed49b 100644
--- a/arch/x86/pci/amd_bus.c
+++ b/arch/x86/pci/amd_bus.c
@@ -44,6 +44,15 @@ static struct pci_root_info __init *find_pci_root_info(int node, int link)
return NULL;
}
+static void __init set_mp_bus_range_to_node(int min_bus, int max_bus, int node)
+{
+#ifdef CONFIG_NUMA
+ int j;
+
+ for (j = min_bus; j <= max_bus; j++)
+ set_mp_bus_to_node(j, node);
+#endif
+}
/**
* early_fill_mp_bus_to_node()
* called before pcibios_scan_root and pci_scan_bus
@@ -53,7 +62,6 @@ static struct pci_root_info __init *find_pci_root_info(int node, int link)
static int __init early_fill_mp_bus_info(void)
{
int i;
- int j;
unsigned bus;
unsigned slot;
int node;
@@ -109,10 +117,7 @@ static int __init early_fill_mp_bus_info(void)
min_bus = (reg >> 16) & 0xff;
max_bus = (reg >> 24) & 0xff;
node = (reg >> 4) & 0x07;
-#ifdef CONFIG_NUMA
- for (j = min_bus; j <= max_bus; j++)
- set_mp_bus_to_node(j, node);
-#endif
+ set_mp_bus_range_to_node(min_bus, max_bus, node);
link = (reg >> 8) & 0x03;
info = alloc_pci_root_info(min_bus, max_bus, node, link);
^ permalink raw reply related
* Re: linux-next: build failure after merge of the driver-core tree
From: Bart Van Assche @ 2012-05-01 7:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Jim Cromie, Roland Dreier
In-Reply-To: <20120501145922.14f2235dff099d20acf3b54a@canb.auug.org.au>
On 05/01/12 04:59, Stephen Rothwell wrote:
> After merging the driver-core tree, today's linux-next build
> (powerpc ppc64_defconfig) failed like this:
>
> In file included from include/linux/kernel.h:23:0, from
> include/linux/cache.h:4, from include/linux/time.h:7, from
> include/linux/stat.h:60, from include/linux/module.h:10, from
> drivers/infiniband/ulp/srp/ib_srp.c:35:
> include/linux/dynamic_debug.h: In function
> 'ddebug_dyndbg_module_param_cb':
> include/linux/dynamic_debug.h:112:3: error: expected ')' before
> 'PFX'
>
> Caused by commit b48420c1d301 ("dynamic_debug: make dynamic-debug
> work for module initialization") interacting with commit
> e0bda7d8c33e ("IB/srp: Use pr_fmt() and pr_err()/pr_warn()") from
> Linus' tree (added before v3.4-rc1).
>
> I have used the driver-core tree from next-20120430 for today.
This reveals that the pr_warn() statement in that dynamic_debug patch
uses the pr_fmt() macro of the module from which it has been included
(e.g. ib_srp) instead that of the dynamic debug module itself. That
looks incorrect to me. How about moving the definition of
ddebug_dyndbg_module_param_cb() from include/linux/dynamic_debug.h
into lib/dynamic_debug.c ?
Bart.
^ permalink raw reply
* linux-next: Tree for May 1
From: Stephen Rothwell @ 2012-05-01 6:22 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 35962 bytes --]
Hi all,
Changes since 20120430:
New trees:
ep93xx-current
ep93xx
The net-next tree lost its build failure.
The drm tree lost its build failure.
The kvm-ppc tree lost its build failure but gained another so I used the
version from 20120430 (with a patch).
The driver-core tree gained a conflict against Linus' tree and a build
failure so I used the version from next-20120420.
The usb tree gained a conflict against the vfs tree.
The arm-soc tree gained a conflict against the mfd 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 27 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@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (655861e Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
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 (5e7371d ARM: 7406/1: hotplug: copy the affinity mask when forcefully migrating IRQs)
Merging ep93xx-current/ep93xx-fixes (2b3c83e dmaengine/ep93xx_dma: Implement double buffering for M2M DMA channels)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (810b4de tty/serial/pmac_zilog: Fix "nobody cared" IRQ message)
Merging sparc/master (e9a5ea1 sparc32,leon: add notify_cpu_starting())
Merging net/master (1cebce3 tcp: fix infinite cwnd in tcp_complete_cwr())
Merging sound-current/for-linus (cff7873 Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
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 (66f2c99 mac80211: fix AP mode EAP tx for VLAN stations)
Merging driver-core.current/driver-core-linus (69964ea Linux 3.4-rc5)
Merging tty.current/tty-linus (66f75a5 Linux 3.4-rc4)
Merging usb.current/usb-linus (69964ea Linux 3.4-rc5)
Merging staging.current/staging-linus (69964ea Linux 3.4-rc5)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads)
Merging md-current/for-linus (30b8aa9 md: fix possible corruption of array metadata on shutdown.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
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 (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 (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (2431a81 spi/spi-bfin5xx: Fix flush of last bit after each spi transfer)
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (4a727ab Merge branches 'amba', 'clkdev', 'fixes', 'mach-types', 'misc' and 'mmci' into for-next)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
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 (de12e47 Merge branch 'next/board-samsung' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (431e69e blackfin: asm: fix blackfin.h broken)
Merging c6x/for-linux-next (c16fa4f Linux 3.3)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (c663600 m68k: Correct the Atari ALLOWINT definition)
Merging m68knommu/for-next (0b66612 m68knommu: simplify the ColdFire 5407 GPIO struct setup)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (d3e4edd Merge branches 'fixes-for-linus', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (ec34a68 powerpc: Remove old powerpc specific ptrace getregs/setregs calls)
Merging 4xx/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging mpc5xxx/next (09f61ff 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 (1571bae [S390] crash dump: add missing SMP dependency)
Merging sh/sh-latest (b2212ea sh64: Kill off unused trap_no/error_code from thread_struct.)
Merging sparc-next/master (799d40c sparc64: Do not set max_mapnr.)
Merging tile/master (5e4ce7a arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (cd9d9f5 rbd: don't hold spinlock during messenger flush)
Merging cifs/master (f7b0069 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
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 (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (77f0a97 jbd: Write journal superblock with WRITE_FUA after checkpointing)
Merging ext4/dev (f1d470b ext4: add metadata checksumming to the list of supported features)
Merging fuse/for-next (519c604 fuse: optimize fallocate on permanent failure)
Merging gfs2/master (1c47f09 GFS2: Eliminate vestigial sd_log_le_rg)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (3617e50 NFSv4.1: Use the correct hostname in the client identifier string)
Merging nfsd/nfsd-next (b108fe6 nfsd: trivial: use SEEK_SET instead of 0 in vfs_llseek)
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 (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (65b3219 UBIFS: remove xattr Kconnfig option)
Merging xfs/for-next (bc236c3 xfs: use shared ilock mode for direct IO writes by default)
Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern)
Merging pci/next (29473ec Merge branch 'topic/yinghai-hostbridge-cleanup' into next)
Merging hid/for-next (d3062a9 Merge branch 'upstream' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
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 (e357d03 i2c: muxes: rename first set of drivers to a standard pattern)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (ede8fc9 hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT)
Merging v4l-dvb/master (2a43f0b Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/usb/gadget/uvc_queue.c
Merging kbuild/for-next (63ce2ed 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 (85d6725 libata: make ata_print_id atomic)
Merging infiniband/for-next (0109487 Merge branch 'lockdep' into for-next)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (8527f8e firewire: core: fw_device_refresh(): clean up error handling)
Merging ubi/linux-next (66f75a5 Linux 3.4-rc4)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/for-next (b965030 Merge branch 'misc' into for-next)
Merging target-updates/for-next (bfb79ea target/iscsi: Go back to core allocating data buffer for cmd)
Merging target-merge/for-next-merge (3e6e9e9 sbp-target: Initial merge of firewire/ieee-1394 target mode support)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (475448a merge: libsas devel rnc-devel fixes)
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
Merging slave-dma/next (56cbb3d Merge branch 'fixes' into next)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (bb63f1f bridge: Fix fatal typo in setup of multicast_querier_expired)
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/param.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Merging wireless-next/master (319006e ipw2100: Fix order of device registration)
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
Merging bluetooth/master (1601881 Bluetooth: Add Code Aurora Forum copyright)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (5568eb3 mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN)
Merging crypto/master (945478a hwrng: omap - use devm_request_and_ioremap)
Merging sound/for-next (dbc3096 Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (5844dbd Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (eead75a Input: add support for DA9052/53 touch screen controller)
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (48eee61 Merge branch 'for-3.5/core' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (27fd946 Fix a memory leak inadvertently introduced during simplification of cell_release_singleton() in commit 6f94a4c45a6f744383f9f695dde019998db3df55 ("dm thin: fix stacked bi_next usage").)
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 (0e9f480 mmc: cd-gpio: protect against NULL context in mmc_cd_gpio_free())
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (732f027 MD RAID1: Further conditionalize 'fullsync')
Merging mfd/for-next (c00ba41 mfd: No need to check for the GPIO offset from asic3_gpio_to_irq)
CONFLICT (content): Merge conflict in drivers/mfd/asic3.c
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (2baf837 drm/edid: fix collision between two patches breaking build)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
Merging fbdev/fbdev-next (3499b1d Merge branch 'fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (ac971f0 Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (08162e6 Yama: remove an unused variable)
CONFLICT (content): Merge conflict in include/linux/filter.h
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 (82b7690 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7aff2d0 Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (15ed103 edac: Fix spelling errors.)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
$ git rm -f sound/soc/imx/Kconfig
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (3564e61 PM / QoS: Create device constraints objects on notifier registration)
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 (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (d57a428 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (dc71c17 Merge branch 'timers/urgent')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging rcu/rcu/next (0d87bdb Merge branches 'barrier.2012.04.26a', 'fixes.2012.04.26a', 'inline.2012.04.25a' and 'srcu.2012.04.30a' into dev3.5-2012.04.30a)
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 (b6ddf05 KVM: x86: Run PIT work in own kthread)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (589ae37 KVM: PPC: Book3S: Enable IRQs during exit handling)
$ git reset --hard HEAD^
Merging refs/next/20120430/kvm-ppc
Applying: KVM/PPC: do not export things twice
[master ee3ae24] Merge commit 'refs/next/20120430/kvm-ppc'
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 (cbcc4ca 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 (6c41792 percpu, x86: don't use PMD_SIZE as embedded atom_size on 32bit)
Merging workqueues/for-next (0976dfc workqueue: Catch more locking problems with flush_work())
Merging drivers-x86/linux-next (e64c9de dell-laptop: Terminate quirks list properly)
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 (56ef671 Merge branches 'regmap-core' and 'regmap-stride' 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 (3ec5652 dynamic_debug: init with early_initcall, not arch_initcall)
CONFLICT (content): Merge conflict in init/main.c
$ git reset --hard HEAD^
Merging refs/next/20120430/driver-core
Merging tty/tty-next (aaa10eb 8250_pci: fix pch uart matching)
Merging usb/usb-next (166cb70 usb: add USB_QUIRK_RESET_RESUME for M-Audio 88es)
CONFLICT (modify/delete): drivers/usb/core/inode.c deleted in usb/usb-next and modified in HEAD. Version HEAD of drivers/usb/core/inode.c left in tree.
$ git rm -f drivers/usb/core/inode.c
Merging staging/staging-next (589b3d0 staging: rtl8192u Fix typos.)
CONFLICT (content): Merge conflict in drivers/staging/vt6656/ioctl.c
CONFLICT (content): Merge conflict in drivers/staging/line6/driver.c
CONFLICT (content): Merge conflict in drivers/staging/android/Makefile
CONFLICT (content): Merge conflict in drivers/staging/android/Kconfig
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers)
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (4cd9069 fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds)
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 (413ba2e pinctrl: support gpio request deferred probing)
CONFLICT (content): Merge conflict in drivers/pinctrl/core.c
CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
Merging tegra/for-next (eb3e805 Merge branch 'for-3.5/defconfig' into for-next)
Merging moduleh/for-sfr (3c5c69b blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c)
Merging vhost/linux-next (33b3aa0 x86: eoi micro-optimization)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (174508b Merge branch 'next/newsoc' into for-next)
CONFLICT (modify/delete): drivers/mfd/ab5500-core.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of drivers/mfd/ab5500-core.c left in tree.
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
$ git rm -f drivers/mfd/ab5500-core.c
Merging ep93xx/ep93xx-cleanup (a1eacd7 arm: ep93xx: use gpio_led_register_device)
Merging kvmtool/master (0333eec kvm tools: Update README for CONFIG_FB_VESA)
Merging dma-mapping/dma-mapping-next (c6b1f07 ARM: integrate CMA with DMA-mapping subsystem)
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging dma-buf/for-next (69964ea Linux 3.4-rc5)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: pagemap.h: fix warning about possibly used before init var
Applying: mm: correctly synchronize rss-counters at exit/exec
Applying: mm-correctly-synchronize-rss-counters-at-exit-exec-fix
Applying: mm: set task exit code before complete_vfork_done()
Applying: umem: fix up unplugging
Applying: arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: connector/userns: replace netlink uses of cap_raised with capable.
Applying: blackfin: use set_current_blocked() and block_sigmask()
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 evaluation of task_failed status
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: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: remove swap token code
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: do not stall on writeback during memory compaction
Applying: mm: vmscan: remove reclaim_mode_t
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: 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: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
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: 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: memcg: add memory controller documentation for hugetlb management
Applying: mm: fix off-by-one bug in print_nodes_state()
Applying: mm: use kcalloc() instead of kzalloc() to allocate array
Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check
Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
Applying: mm/fork: fix overflow in vma length when copying mmap on clone
Applying: mm/vmstat.c: remov debug fs entries on failure of file creation and made extfrag_debug_root dentry local
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: CodingStyle: add kmalloc_array() to memory allocators
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: introduce SIZE_MAX
Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table
Applying: vsprintf: correctly handle width when '#' flag used in %#p format.
Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: lcd: add callbacks for early fb event blank support
Applying: fbdev: add events for early fb event support
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: lm3556: Don't call kfree for the memory allocated by devm_kzalloc
Applying: leds: simple_strtoul() cleanup
Applying: leds: Use kcalloc instead of kzalloc to allocate array
Applying: leds: add new field to led_classdev struct to save activation state
Applying: leds: change existing triggers to use activated flag
Applying: leds: change ledtrig-timer to use activated flag
Applying: include/linux/led-lm3530.h: comment correction about the range of brightness
Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization
Applying: leds: heartbeat: stop on shutdown
Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: lib/string_helpers.c: make arrays static
Applying: lib/bitmap.c: fix documentation for scnprintf() functions
Applying: vsprintf: fix %ps on non symbols when using kallsyms
Applying: spinlock_debug: print kallsyms name for lock
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: rtc: ds1307: remove superfluous initialization
Applying: rtc: ds1307: add trickle charger support
Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
Applying: HPFS: remove PRINTK() macro
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod.c: fix kernel-doc warning
Applying: kmod: avoid deadlock from recursive kmod call
Applying: cred: remove task_is_dead() from __task_cred() validation
Applying: stack usage: add pid to warning printk in check_stack_usage
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: don't do dummy rcu_read_lock/rcu_read_unlock on error path
Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
Applying: procfs: use more apprioriate types when dumping /proc/N/stat
Applying: proc: use IS_ERR_OR_NULL()
Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters
Applying: ipc/sem.c: alternatives to preempt_disable()
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: mqueue: revert bump up DFLT_*MAX
Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE
Applying: mqueue: separate mqueue default value from maximum value
Applying: selftests: add mq_open_tests
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: eventfd: change int to __u64 in eventfd_signal()
Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix
Applying: w1: fix ds28e04 build, select CRC16
Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: simplify PR_SET_MM on mm::code/data assignment
Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: kconfig: update compression algorithm info
Applying: notify_change(): check that i_mutex is held
Applying: ipc/mqueue: using vmalloc requires including vmalloc.h
Merging akpm (bd9bd58 ipc/mqueue: using vmalloc requires including vmalloc.h)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the pci tree
From: Stephen Rothwell @ 2012-05-01 6:08 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-next, linux-kernel, Yinghai Lu
[-- Attachment #1: Type: text/plain, Size: 444 bytes --]
Hi Bjorn,
After merging the pci tree, today's linux-next build (i386 defconfig)
produced this warning:
arch/x86/pci/amd_bus.c: In function 'early_fill_mp_bus_info':
arch/x86/pci/amd_bus.c:56:6: warning: unused variable 'j' [-Wunused-variable]
Introduced by commit d28e5ac2a07e ("x86/PCI: dynamically allocate
pci_root_info for native host bridge drivers").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the arm-soc tree with the mfd tree
From: Stephen Rothwell @ 2012-05-01 5:34 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, "Uwe Kleine-König",
Samuel Ortiz, Linus Walleij
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mfd/ab5500-core.c between commit 9ea969f0d79d ("mfd: Mark const
init data with __initconst instead of __initdata for ab5500") from the
mfd tree and commit f76facc2354b ("mfd/ab5500: delete AB5500 support")
from the arm-soc tree.
The latter removes the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the usb tree with the vfs tree
From: Stephen Rothwell @ 2012-05-01 5:04 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Al Viro
[-- Attachment #1: Type: text/plain, Size: 427 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/inode.c between commit eaf5fb5977e0 ("switch usbfs to
use of simple_{unlink,rmdir}") from the tree and commit fb28d58b72aa
("USB: remove CONFIG_USB_DEVICEFS") from the usb tree.
The latter removes the file modified by the former, so I just removed the
file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the driver-core tree with Linus' tree
From: Stephen Rothwell @ 2012-05-01 5:01 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Jim Cromie, Rusty Russell,
Chris Metcalf
[-- Attachment #1: Type: text/plain, Size: 2875 bytes --]
Hi Greg,
Today's linux-next merge of the driver-core tree got a conflict in
init/main.c between commit a99cd1125189 ("init: fix bug where environment
vars can't be passed via boot args") from Linus' tree and commit
9fb48c744ba6 ("params: add 3rd arg to option handler callback signature")
from the driver-core tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc init/main.c
index 44b2433,11bc6f7..0000000
--- a/init/main.c
+++ b/init/main.c
@@@ -225,9 -225,14 +225,10 @@@ static int __init loglevel(char *str
early_param("loglevel", loglevel);
-/*
- * Unknown boot options get handed to init, unless they look like
- * unused parameters (modprobe will find them in /proc/cmdline).
- */
-static int __init unknown_bootoption(char *param, char *val,
+/* Change NUL term back to "=", to make "param" the whole string. */
- static int __init repair_env_string(char *param, char *val)
++static int __init repair_env_string(char *param, char *val,
+ const char *unused)
{
- /* Change NUL term back to "=", to make "param" the whole string. */
if (val) {
/* param=val or param="val"? */
if (val == param+strlen(param)+1)
@@@ -239,16 -244,6 +240,17 @@@
} else
BUG();
}
+ return 0;
+}
+
+/*
+ * Unknown boot options get handed to init, unless they look like
+ * unused parameters (modprobe will find them in /proc/cmdline).
+ */
- static int __init unknown_bootoption(char *param, char *val)
++static int __init unknown_bootoption(char *param, char *val,
++ const char *unused)
+{
- repair_env_string(param, val);
++ repair_env_string(param, val, unused);
/* Handle obsolete-style parameters */
if (obsolete_checksetup(param))
@@@ -728,16 -723,22 +730,16 @@@ static initcall_t *initcall_levels[] __
};
static char *initcall_level_names[] __initdata = {
- "early parameters",
- "core parameters",
- "postcore parameters",
- "arch parameters",
- "subsys parameters",
- "fs parameters",
- "device parameters",
- "late parameters",
+ "early",
+ "core",
+ "postcore",
+ "arch",
+ "subsys",
+ "fs",
+ "device",
+ "late",
};
-static int __init ignore_unknown_bootoption(char *param, char *val,
- const char *doing)
-{
- return 0;
-}
-
static void __init do_initcall_level(int level)
{
extern const struct kernel_param __start___param[], __stop___param[];
@@@ -748,7 -749,7 +750,7 @@@
static_command_line, __start___param,
__stop___param - __start___param,
level, level,
- repair_env_string);
- &ignore_unknown_bootoption);
++ &repair_env_string);
for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
do_one_initcall(*fn);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the driver-core tree
From: Stephen Rothwell @ 2012-05-01 4:59 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Bart Van Assche, Jim Cromie,
Roland Dreier
[-- Attachment #1: Type: text/plain, Size: 947 bytes --]
Hi Greg,
After merging the driver-core tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
In file included from include/linux/kernel.h:23:0,
from include/linux/cache.h:4,
from include/linux/time.h:7,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from drivers/infiniband/ulp/srp/ib_srp.c:35:
include/linux/dynamic_debug.h: In function 'ddebug_dyndbg_module_param_cb':
include/linux/dynamic_debug.h:112:3: error: expected ')' before 'PFX'
Caused by commit b48420c1d301 ("dynamic_debug: make dynamic-debug work
for module initialization") interacting with commit e0bda7d8c33e
("IB/srp: Use pr_fmt() and pr_err()/pr_warn()") from Linus' tree (added
before v3.4-rc1).
I have used the driver-core tree from next-20120430 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the kvm-ppc tree
From: Benjamin Herrenschmidt @ 2012-05-01 4:55 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Alexander Graf, linux-next, linux-kernel
In-Reply-To: <20120501135549.5c865717b33650002f083d4a@canb.auug.org.au>
On Tue, 2012-05-01 at 13:55 +1000, Stephen Rothwell wrote:
> After merging the kvm-ppc tree, today's linux-next build
> (powerpc_ppc64_defconfig) failed like this:
>
> arch/powerpc/kvm/built-in.o: In function `.kvm_spapr_tce_release':
> book3s_64_vio.c:(.text+0x374c): undefined reference to `.kvm_put_kvm'
> arch/powerpc/kvm/built-in.o: In function
> `.kvm_vm_ioctl_create_spapr_tce':
> (.text+0x3ae8): undefined reference to `.kvm_get_kvm'
>
> Presumably caused by commit 969f70395d6d ("kvm/book3s: Make kernel
> emulated H_PUT_TCE available for "PR" KVM").
>
> I have used the kvm-ppc tree from next-20120430 for today.
Hrm, I wrote that patch :-) It used to work... Alex, probably just a
missing #include no ?
Cheers,
Ben.
^ permalink raw reply
* linux-next: build failure after merge of the kvm-ppc tree
From: Stephen Rothwell @ 2012-05-01 3:55 UTC (permalink / raw)
To: Alexander Graf; +Cc: linux-next, linux-kernel, Benjamin Herrenschmidt
[-- Attachment #1: Type: text/plain, Size: 672 bytes --]
Hi Alex,
After merging the kvm-ppc tree, today's linux-next build
(powerpc_ppc64_defconfig) failed like this:
arch/powerpc/kvm/built-in.o: In function `.kvm_spapr_tce_release':
book3s_64_vio.c:(.text+0x374c): undefined reference to `.kvm_put_kvm'
arch/powerpc/kvm/built-in.o: In function `.kvm_vm_ioctl_create_spapr_tce':
(.text+0x3ae8): undefined reference to `.kvm_get_kvm'
Presumably caused by commit 969f70395d6d ("kvm/book3s: Make kernel
emulated H_PUT_TCE available for "PR" KVM").
I have used the kvm-ppc tree from next-20120430 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: Request for inclusion of ep93xx tree in linux-next
From: Stephen Rothwell @ 2012-05-01 0:27 UTC (permalink / raw)
To: Ryan Mallon
Cc: H Hartley Sweeten, Mika Westerberg, Arnd Bergmann, arm,
'linux-arm-kernel@lists.infradead.org', linux-next
In-Reply-To: <4F9F16A9.9090108@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2233 bytes --]
Hi Ryan,
On Tue, 01 May 2012 08:48:09 +1000 Ryan Mallon <rmallon@gmail.com> wrote:
>
> Can you please add the following branches:
>
> ep93xx-cleanup
> ep93xx-fixes
>
> from the ep93xx git tree:
>
> git://github.com/RyanMallon/linux-ep93xx.git
>
> To linux-next. Both branches are stable and based on v3.4-rc2. Testing
> for the tree is covered by the arm ep93xx_defconfig.
I have added these from today as ep93xx-current (fixes for Linus' current
tree - branch ep93xx-fixes) and ep93xx (stuff for the next merge window -
branch ep93xx-cleanup). I have listed just you as the contact in case I
have problems (conflicts, build failures, unable to fetch etc).
Thanks for adding your subsystem tree as a participant of linux-next. As
you may know, this is not a judgment of your code. The purpose of
linux-next is for integration testing and to lower the impact of
conflicts between subsystems in the next merge window.
You will need to ensure that the patches/commits in your tree/series have
been:
* submitted under GPL v2 (or later) and include the Contributor's
Signed-off-by,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It is allowed to be rebased if you deem it necessary.
--
Cheers,
Stephen Rothwell
sfr@canb.auug.org.au
Legal Stuff:
By participating in linux-next, your subsystem tree contributions are
public and will be included in the linux-next trees. You may be sent
e-mail messages indicating errors or other issues when the
patches/commits from your subsystem tree are merged and tested in
linux-next. These messages may also be cross-posted to the linux-next
mailing list, the linux-kernel mailing list, etc. The linux-next tree
project and IBM (my employer) make no warranties regarding the linux-next
project, the testing procedures, the results, the e-mails, etc. If you
don't agree to these ground rules, let me know and I'll remove your tree
from participation in linux-next.
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Request for inclusion of ep93xx tree in linux-next
From: Ryan Mallon @ 2012-04-30 22:48 UTC (permalink / raw)
To: Stephen Rothwell, H Hartley Sweeten, Mika Westerberg,
Arnd Bergmann
Cc: arm, 'linux-arm-kernel@lists.infradead.org', linux-next
Hi Stephen,
Can you please add the following branches:
ep93xx-cleanup
ep93xx-fixes
from the ep93xx git tree:
git://github.com/RyanMallon/linux-ep93xx.git
To linux-next. Both branches are stable and based on v3.4-rc2. Testing
for the tree is covered by the arm ep93xx_defconfig.
Thanks,
~Ryan
^ permalink raw reply
* Re: [PATCH resend] nfsd: fix nfs4recover.c printk format warning
From: J. Bruce Fields @ 2012-04-30 21:41 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
linux-nfs-u79uwXL29TY76Z2rM5mHXA, Andrew Morton, Linus Torvalds
In-Reply-To: <4F9EE72B.1020401-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
On Mon, Apr 30, 2012 at 12:25:31PM -0700, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
>
> Fix printk format warnings -- both items are size_t,
> so use %zu to print them.
>
> fs/nfsd/nfs4recover.c:580:3: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'size_t'
> fs/nfsd/nfs4recover.c:580:3: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'unsigned int'
>
> Signed-off-by: Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
> Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
> Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Looks like Linus just took this. (Thanks!)
--b.
> ---
> fs/nfsd/nfs4recover.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> This patch was originally sent on Apr.19/2012 for linux-next.
> It is still needed in linux-next and in mainline.
>
>
> --- linux-next-20120419.orig/fs/nfsd/nfs4recover.c
> +++ linux-next-20120419/fs/nfsd/nfs4recover.c
> @@ -577,7 +577,7 @@ cld_pipe_downcall(struct file *filp, con
> struct cld_net *cn = nn->cld_net;
>
> if (mlen != sizeof(*cmsg)) {
> - dprintk("%s: got %lu bytes, expected %lu\n", __func__, mlen,
> + dprintk("%s: got %zu bytes, expected %zu\n", __func__, mlen,
> sizeof(*cmsg));
> return -EINVAL;
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH resend] nfsd: fix nfs4recover.c printk format warning
From: Randy Dunlap @ 2012-04-30 19:25 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next-u79uwXL29TY76Z2rM5mHXA, LKML,
J. Bruce Fields, linux-nfs-u79uwXL29TY76Z2rM5mHXA, Andrew Morton,
Linus Torvalds
In-Reply-To: <4F909C78.7000008-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
From: Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
Fix printk format warnings -- both items are size_t,
so use %zu to print them.
fs/nfsd/nfs4recover.c:580:3: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'size_t'
fs/nfsd/nfs4recover.c:580:3: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'unsigned int'
Signed-off-by: Randy Dunlap <rdunlap-/UHa2rfvQTnk1uMJSBkQmQ@public.gmane.org>
Cc: "J. Bruce Fields" <bfields-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
Cc: linux-nfs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
fs/nfsd/nfs4recover.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
This patch was originally sent on Apr.19/2012 for linux-next.
It is still needed in linux-next and in mainline.
--- linux-next-20120419.orig/fs/nfsd/nfs4recover.c
+++ linux-next-20120419/fs/nfsd/nfs4recover.c
@@ -577,7 +577,7 @@ cld_pipe_downcall(struct file *filp, con
struct cld_net *cn = nn->cld_net;
if (mlen != sizeof(*cmsg)) {
- dprintk("%s: got %lu bytes, expected %lu\n", __func__, mlen,
+ dprintk("%s: got %zu bytes, expected %zu\n", __func__, mlen,
sizeof(*cmsg));
return -EINVAL;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH net-next] net/l2tp: fix build error in l2tp from missing ipv6 checksum include
From: David Miller @ 2012-04-30 17:31 UTC (permalink / raw)
To: bcrl; +Cc: sfr, netdev, linux-next, linux-kernel
In-Reply-To: <20120430172402.GL17021@kvack.org>
From: Benjamin LaHaise <bcrl@kvack.org>
Date: Mon, 30 Apr 2012 13:24:02 -0400
> Can you please verify if the patch below fixes the issue? Thanks.
I already checked a fix into the tree.
^ permalink raw reply
* Re: [PATCH] ARM:mfd: fix ezx-pcap build failure
From: Mark Asselstine @ 2012-04-30 17:26 UTC (permalink / raw)
To: Mark Brown
Cc: Russell King - ARM Linux, openezx-devel, sameo, haojian.zhuang,
Grant Likely, linux-next, linux-arm-kernel
In-Reply-To: <20120427180235.GA19778@sirena.org.uk>
On April 27, 2012 19:02:35 Mark Brown wrote:
> On Fri, Apr 27, 2012 at 11:28:28AM -0400, Mark Asselstine wrote:
> > On April 26, 2012 22:52:58 Russell King - ARM Linux wrote:
> > > What is the effect when the supplied IRQ does not have a mapping to
> > > a
> > > GPIO - or it _does_ by way of a badly coded irq_to_gpio() function
> > > but that GPIO is not the correct one.
> > >
> > > There is no prevention against endlessly looping, so it could cause
> > > a
> > > system lockup.
> >
> > Unfortunately the commit [b1148fd4 mfd: fix pcap irq bottom handler
> > ] which modified things to loop as long as the interrupt is asserted
> > didn't supply much information regarding the behavior they were trying
> > to achieve/fix nor what would be the consequence of bailing earlier.
>
> The usual reason for this pattern is to simulate level triggered IRQs on
> an edge triggered interrupt controller.
Makes sense. OK. I want to help here with a complete fix but it has been a
while since I have waded into SPI and ARM initialization so here are some
stumbling blocks for me.
If I first fix the build issue by adding 'int gpio_num' to the
pcap_platform_data and made use of pdata->gpio_num in place of irq_to_gpio()
in pcap_isr_work(). Now to set gpio_num.
In the board .c file I would assume the goal would be to create the necessary
structs to set gpio_num for "ezx-pcap" and pass them to
spi_register_board_info(). Right? But should I expect to already see some of
this infrastructure in place already? Doesn't the "ezx-pcap" device already
have to be defined somewhere, to have irq_base set for example? Or is this
coming from firmware?
Thanks,
Mark A.
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (net-next tree related)
From: David Miller @ 2012-04-30 17:22 UTC (permalink / raw)
To: sfr; +Cc: netdev, linux-next, linux-kernel, bcrl
In-Reply-To: <20120430155836.44bcf3846c80cf686bb9cb77@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Apr 2012 15:58:36 +1000
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> net/l2tp/l2tp_core.c: In function 'l2tp_verify_udp_checksum':
> net/l2tp/l2tp_core.c:464:7: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
>
> Caused by commit d2cf3361677e ("net/l2tp: add support for L2TP over IPv6
> UDP"). Include file missing.
>
> I have reverted that commit for today.
The fix is less work than the revert on this one isn't it? :-)
Pushed to net-next, thanks Stephen:
--------------------
l2tp: Add missing net/net/ip6_checksum.h include.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/l2tp/l2tp_core.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index e91d559..0ca9bc3 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -56,6 +56,7 @@
#include <net/inet6_connection_sock.h>
#include <net/inet_ecn.h>
#include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
#include <asm/byteorder.h>
#include <linux/atomic.h>
--
1.7.7.6
^ permalink raw reply related
* [PATCH net-next] net/l2tp: fix build error in l2tp from missing ipv6 checksum include
From: Benjamin LaHaise @ 2012-04-30 17:24 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: David Miller, netdev, linux-next, linux-kernel
In-Reply-To: <20120430155836.44bcf3846c80cf686bb9cb77@canb.auug.org.au>
Hi Stephen,
Can you please verify if the patch below fixes the issue? Thanks.
-ben
----
net/l2tp: fix build error in l2tp from missing ipv6 checksum include
L2TP needs to ensure the IPv6 checksum helpers are included.
Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
---
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index e91d559..0ca9bc3 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -56,6 +56,7 @@
#include <net/inet6_connection_sock.h>
#include <net/inet_ecn.h>
#include <net/ip6_route.h>
+#include <net/ip6_checksum.h>
#include <asm/byteorder.h>
#include <linux/atomic.h>
^ permalink raw reply related
* Re: linux-next: build warning after merge of the hid tree
From: Jiri Kosina @ 2012-04-30 8:42 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
In-Reply-To: <20120430140523.bdb69a1c0e7d23522a5759d7@canb.auug.org.au>
On Mon, 30 Apr 2012, Stephen Rothwell wrote:
> Hi Jiri,
>
> After merging the hid tree, today's linux-next build (powerpc
> ppc64_defconfig) produced this warning:
>
> In file included from drivers/hid/hid-core.c:37:0:
> include/linux/hidraw.h: In function 'hidraw_report_event':
> include/linux/hidraw.h:85:46: warning: no return statement in function returning non-void [-Wreturn-type]
>
> Introduced by commit b6787242f327 ("HID: hidraw: add proper error
> handling to raw event reporting").
Now fixed by d6d7c87352, thanks a lot for the report.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply
* linux-next: Tree for Apr 30
From: Stephen Rothwell @ 2012-04-30 6:13 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 35298 bytes --]
Hi all,
Changes since 20120427:
The sparc-next tree lost its conflict.
The net-next tree gained a build failure for which I reverted a commit.
The drm tree gained a build failure so I used the version from
next-20120427.
The kvm-ppc tree still had its build failure for which I added a patch.
The usb tree lost its build failure.
The akpm tree lost a couple of 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 187 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@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master (69964ea Linux 3.4-rc5)
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 (5e7371d ARM: 7406/1: hotplug: copy the affinity mask when forcefully migrating IRQs)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (446f6d0 powerpc/mpic: Properly set default triggers)
Merging sparc/master (e9a5ea1 sparc32,leon: add notify_cpu_starting())
Merging net/master (3885ca7 drop_monitor: Make updating data->skb smp safe)
Merging sound-current/for-linus (cff7873 Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
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 (4c1bcdb wl1251: fix crash on remove due to leftover work item)
Merging driver-core.current/driver-core-linus (e816b57 Linux 3.4-rc3)
Merging tty.current/tty-linus (66f75a5 Linux 3.4-rc4)
Merging usb.current/usb-linus (41c8a48 Merge tag 'fixes-for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus)
Merging staging.current/staging-linus (89f21cc staging: ozwpan: Fix bug where kfree is called twice.)
Merging char-misc.current/char-misc-linus (e816b57 Linux 3.4-rc3)
Merging cpufreq-current/fixes (6139b65 Merge branch 'for_3.4/cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes)
Merging input-current/for-linus (899c612 Input: synaptics - fix regression with "image sensor" trackpads)
Merging md-current/for-linus (30b8aa9 md: fix possible corruption of array metadata on shutdown.)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
Merging crypto-current/master (511d63c crypto: talitos - properly lock access to global talitos registers)
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 (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 (766644d of/irq: add empty irq_of_parse_and_map() for non-dt builds)
Merging spi-current/spi/merge (2431a81 spi/spi-bfin5xx: Fix flush of last bit after each spi transfer)
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (4a727ab Merge branches 'amba', 'clkdev', 'fixes', 'mach-types', 'misc' and 'mmci' into for-next)
Merging arm-perf/for-next/perf (c16fa4f Linux 3.3)
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 (de12e47 Merge branch 'next/board-samsung' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (431e69e blackfin: asm: fix blackfin.h broken)
Merging c6x/for-linux-next (c16fa4f Linux 3.3)
Merging cris/for-next (7b91747 cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile)
Merging hexagon/linux-next (4bd8193 various Kconfig cleanup and old platform build code removal)
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (c663600 m68k: Correct the Atari ALLOWINT definition)
Merging m68knommu/for-next (b97c0bb m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (d3e4edd Merge branches 'fixes-for-linus', 'module.h-fixes', 'next/ath79' and 'next/lantiq' into mips-for-linux-next)
Merging openrisc/for-upstream (c88e692 asm-generic: add linux/types.h to cmpxchg.h)
Merging parisc/for-next (c60dc74 Merge branch 'fixes' into for-next)
Merging powerpc/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging 4xx/next (0195c00 Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system)
Merging mpc5xxx/next (09f61ff 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 (1571bae [S390] crash dump: add missing SMP dependency)
Merging sh/sh-latest (b2212ea sh64: Kill off unused trap_no/error_code from thread_struct.)
Merging sparc-next/master (799d40c sparc64: Do not set max_mapnr.)
Merging tile/master (5e4ce7a arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (cd9d9f5 rbd: don't hold spinlock during messenger flush)
Merging cifs/master (f7b0069 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
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 (6cfd4b4 ecryptfs: remove the second argument of k[un]map_atomic())
CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h
Merging ext3/for_next (77f0a97 jbd: Write journal superblock with WRITE_FUA after checkpointing)
Merging ext4/dev (f1d470b ext4: add metadata checksumming to the list of supported features)
Merging fuse/for-next (519c604 fuse: optimize fallocate on permanent failure)
Merging gfs2/master (06344b9 GFS2: Eliminate needless parameter from function gfs2_setbit)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (71dfc5f NFS: get module in idmap PipeFS notifier callback)
Merging nfsd/nfsd-next (b108fe6 nfsd: trivial: use SEEK_SET instead of 0 in vfs_llseek)
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 (01627d9 Merge branch 'drm-fixes-intel' of git://people.freedesktop.org/~airlied/linux)
Merging ubifs/linux-next (65b3219 UBIFS: remove xattr Kconnfig option)
Merging xfs/for-next (bc236c3 xfs: use shared ilock mode for direct IO writes by default)
Merging vfs/for-next (9448152 sch_atm.c: get rid of poinless extern)
Merging pci/next (96650e8 PCI: move mutex locking out of pci_dev_reset function)
Merging hid/for-next (9fbfede Merge branch 'upstream' into for-next)
Merging quilt/i2c (85bb1a8 i2c-dev: Add support for I2C_M_RECV_LEN)
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 (e357d03 i2c: muxes: rename first set of drivers to a standard pattern)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (ede8fc9 hwmon: (ad7314) Remove unused defines, and rename OFFSET to SHIFT)
Merging v4l-dvb/master (2a43f0b Merge /home/v4l/v4l/patchwork)
CONFLICT (content): Merge conflict in drivers/usb/gadget/uvc_queue.c
Merging kbuild/for-next (63ce2ed 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 (85d6725 libata: make ata_print_id atomic)
Merging infiniband/for-next (754c8d4 Merge branch 'raw-qp' into for-next)
Merging acpi/next (eeaab2d Merge branches 'idle-fix' and 'misc' into release)
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
Merging ieee1394/for-next (8527f8e firewire: core: fw_device_refresh(): clean up error handling)
Merging ubi/linux-next (66f75a5 Linux 3.4-rc4)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/for-next (b965030 Merge branch 'misc' into for-next)
Merging target-updates/for-next (bfb79ea target/iscsi: Go back to core allocating data buffer for cmd)
Merging target-merge/for-next-merge (3e6e9e9 sbp-target: Initial merge of firewire/ieee-1394 target mode support)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (475448a merge: libsas devel rnc-devel fixes)
CONFLICT (content): Merge conflict in include/scsi/libsas.h
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_discover.c
Merging slave-dma/next (56cbb3d Merge branch 'fixes' into next)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (d2cf336 net/l2tp: add support for L2TP over IPv6 UDP)
CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/param.c
CONFLICT (content): Merge conflict in drivers/net/ethernet/emulex/benet/be.h
Merging wireless-next/master (11069ef mac80211: don't transmit 40MHz frames to 20MHz peer)
CONFLICT (content): Merge conflict in net/bluetooth/mgmt.c
CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c
Merging bluetooth/master (805db9c Bluetooth: Add Code Aurora Forum copyright)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (5568eb3 mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN)
Merging crypto/master (945478a hwrng: omap - use devm_request_and_ioremap)
Merging sound/for-next (dbc3096 Merge branch 'topic/misc' into for-next)
Merging sound-asoc/for-next (2fbbbc1 Merge branch 'for-3.5' into asoc-next)
Merging cpufreq/next (a7b422c provide disable_cpufreq() function to disable the API.)
Merging quilt/rr (2a22b63 cpumask: remove old cpu_*_map.)
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in drivers/virtio/virtio_balloon.c
CONFLICT (content): Merge conflict in arch/arm/kernel/smp.c
CONFLICT (content): Merge conflict in arch/arm/kernel/kprobes.c
Merging input/next (5d06647 Input: use module_pci_driver)
Merging input-mt/for-next (66f75a5 Linux 3.4-rc4)
Merging cgroup/for-next (0d4dde1 res_counter: Account max_usage when calling res_counter_charge_nofail())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (48eee61 Merge branch 'for-3.5/core' into for-next)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging quilt/device-mapper (025716f Fix a memory leak inadvertently introduced during simplification of cell_release_singleton() in commit 6f94a4c45a6f744383f9f695dde019998db3df55 ("dm thin: fix stacked bi_next usage").)
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 (0e9f480 mmc: cd-gpio: protect against NULL context in mmc_cd_gpio_free())
Merging kgdb/kgdb-next (3751d3e x86,kgdb: Fix DEBUG_RODATA limitation using text_poke())
Merging slab/for-next (b80b6c0 Merge branch 'slab/next' into for-next)
Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
Merging md/for-next (732f027 MD RAID1: Further conditionalize 'fullsync')
Merging mfd/for-next (c00ba41 mfd: No need to check for the GPIO offset from asic3_gpio_to_irq)
CONFLICT (content): Merge conflict in drivers/mfd/asic3.c
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (f7f6c34 drm: fixed: Add dfixed_frac)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
$ git reset --hard HEAD^
Merging refs/next/20120427/drm
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
[master 6b59ef1] Merge commit 'refs/next/20120427/drm'
Merging fbdev/fbdev-next (3499b1d Merge branch 'fixes' of git://linuxtv.org/pinchartl/fbdev into fbdev-next)
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
Merging omap_dss2/for-next (df01d53 OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update)
Merging regulator/for-next (ac971f0 Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (08162e6 Yama: remove an unused variable)
CONFLICT (content): Merge conflict in include/linux/filter.h
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 (82b7690 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7aff2d0 Merge branches 'iommu/fixes', 'dma-debug', 'arm/omap' and 'arm/tegra' into next)
Merging osd/linux-next (72749a2 exofs: Cap on the memcpy() size)
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
Merging trivial/for-next (59bf896 Fix "the the" in various Kconfig)
CONFLICT (modify/delete): sound/soc/imx/Kconfig deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of sound/soc/imx/Kconfig left in tree.
$ git rm -f sound/soc/imx/Kconfig
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (3564e61 PM / QoS: Create device constraints objects on notifier registration)
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 (a4b4be3 edac: rename channel_info to rank_info)
Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
Merging devicetree/devicetree/next (0f22dd3 of: Only compile OF_DYNAMIC on PowerPC pseries and iseries)
Merging spi/spi/next (d57a428 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (dc71c17 Merge branch 'timers/urgent')
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging rcu/rcu/next (b46dbb4 Merge branches 'barrier.2012.04.25a', 'fixes.2012.04.25a', 'inline.2012.04.25a' and 'srcu.2012.04.25a' into next.2012.04.25a)
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 (b6ddf05 KVM: x86: Run PIT work in own kthread)
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging kvm-ppc/kvm-ppc-next (4831570 KVM: PPC: Book3S: Call into C interrupt handlers)
Applying: KVM/PPC: do not export things twice
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 (cbcc4ca 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 (6c41792 percpu, x86: don't use PMD_SIZE as embedded atom_size on 32bit)
Merging workqueues/for-next (0976dfc workqueue: Catch more locking problems with flush_work())
Merging drivers-x86/linux-next (e64c9de dell-laptop: Terminate quirks list properly)
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 (b076764 Merge branch 'regmap-stride' into regmap-next)
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
Merging driver-core/driver-core-next (a1d26ac Extcon: check for allocation failure)
Merging tty/tty-next (5d1a33f vt: push the tty_lock down into the map handling)
Merging usb/usb-next (4212cd7 USB: usb-skeleton.c: remove err() usage)
Merging staging/staging-next (db3b9e9 Staging: VME: move VME drivers out of staging)
CONFLICT (content): Merge conflict in drivers/staging/vt6656/ioctl.c
CONFLICT (content): Merge conflict in drivers/staging/line6/driver.c
CONFLICT (content): Merge conflict in drivers/staging/android/Makefile
CONFLICT (content): Merge conflict in drivers/staging/android/Kconfig
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging char-misc/char-misc-next (9912143 parport: remove unused dead code from lowlevel drivers)
Merging tmem/linux-next (0f1ea93 Merge branch 'stable/frontswap.v14' into linux-next)
Merging writeback/writeback-for-next (4cd9069 fs: remove 8 bytes of padding from struct writeback_control on 64 bit builds)
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 (413ba2e pinctrl: support gpio request deferred probing)
CONFLICT (content): Merge conflict in drivers/pinctrl/core.c
CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
Merging tegra/for-next (2a2560e Merge branch 'for-3.5/defconfig' into for-next)
Merging moduleh/for-sfr (3c5c69b blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c)
Merging vhost/linux-next (33b3aa0 x86: eoi micro-optimization)
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging kmap_atomic/kmap_atomic (317b6e1 feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal)
Merging modem-shm/for-next (3cff1cc caif_shm: Add CAIF driver for Shared memory for M7400)
CONFLICT (content): Merge conflict in drivers/Kconfig
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
Merging remoteproc/for-next (e12bc14 remoteproc: s/big switch/lookup table/)
Merging irqdomain/irqdomain/next (e7cc3ac dt: fix twl4030 for non-dt compile on x86)
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (551b5e1 Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in arch/arm/mach-lpc32xx/common.c
Merging kvmtool/master (0333eec kvm tools: Update README for CONFIG_FB_VESA)
Merging dma-mapping/dma-mapping-next (c6b1f07 ARM: integrate CMA with DMA-mapping subsystem)
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging dma-buf/for-next (66f75a5 Linux 3.4-rc4)
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: pagemap.h: fix warning about possibly used before init var
Applying: mm: correctly synchronize rss-counters at exit/exec
Applying: mm-correctly-synchronize-rss-counters-at-exit-exec-fix
Applying: mm: set task exit code before complete_vfork_done()
Applying: umem: fix up unplugging
Applying: arch/x86/platform/geode/net5501.c: change active_low to 0 for LED driver
Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
Applying: intel_mid_powerbtn: mark irq as IRQF_NO_SUSPEND
Applying: arch/x86/include/asm/spinlock.h: fix comment
Applying: arch/x86/kernel/apic/io_apic.c: move io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ
Applying: drivers/xen/Kconfig: fix Kconfig layout
Applying: avr32: don't mask signals in the error path
Applying: avr32: use set_current_blocked() in handle_signal/sys_rt_sigreturn
Applying: avr32: use block_sigmask()
Applying: m32r: use set_current_blocked() and block_sigmask()
Applying: m68k: use set_current_blocked() and block_sigmask()
Applying: mn10300: use set_current_blocked() and block_sigmask()
Applying: cpuidle: remove unused hrtimer_peek_ahead_timers() call
Applying: cris: use set_current_blocked() and block_sigmask()
Applying: cris: select GENERIC_ATOMIC64
Applying: x86: use this_cpu_xxx to replace percpu_xxx funcs
Applying: x86-use-this_cpu_xxx-to-replace-percpu_xxx-funcs-fix
Applying: x86: change percpu_read_stable() to this_cpu_read_stable()
Applying: net: use this_cpu_xxx replace percpu_xxx funcs
Applying: percpu: remove percpu_xxx() functions
Applying: percpu-remove-percpu_xxx-functions-fix
Applying: timeconst.pl: remove deprecated defined(@array)
Applying: ia64: use set_current_blocked() and block_sigmask()
Applying: microblaze: don't reimplement force_sigsegv()
Applying: microblaze: no need to reset handler if SA_ONESHOT
Applying: microblaze: fix signal masking
Applying: microblaze: use set_current_blocked() and block_sigmask()
Applying: score: don't mask signals if we fail to setup signal stack
Applying: score: use set_current_blocked() and block_sigmask()
Applying: h8300: use set_current_blocked() and block_sigmask()
Applying: unicore32: use block_sigmask()
Applying: connector/userns: replace netlink uses of cap_raised with capable.
Applying: blackfin: use set_current_blocked() and block_sigmask()
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 evaluation of task_failed status
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: fsnotify: remove unused parameter from send_to_group()
Applying: fsnotify: handle subfiles' perm events
Applying: brlocks/lglocks: cleanups
Applying: mm/memory_failure: let the compiler add the function name
Applying: mm/mempolicy.c: use enum value MPOL_REBIND_ONCE in mpol_rebind_policy()
Applying: mm/hugetlb.c: use long vars instead of int in region_count()
Applying: mm, thp: remove unnecessary ret variable
Applying: mm, thp: allow fallback when pte_alloc_one() fails for huge pmd
Applying: mm: remove swap token code
Applying: mm: vmscan: remove lumpy reclaim
Applying: mm: vmscan: do not stall on writeback during memory compaction
Applying: mm: vmscan: remove reclaim_mode_t
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: 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: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
Applying: hugetlb: simplify migrate_huge_page()
Applying: memcg: add HugeTLB extension
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: 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: memcg: add memory controller documentation for hugetlb management
Applying: mm: fix off-by-one bug in print_nodes_state()
Applying: mm: use kcalloc() instead of kzalloc() to allocate array
Applying: mm/mmap.c: find_vma(): remove unnecessary if(mm) check
Applying: mm-mmapc-find_vma-remove-unnecessary-ifmm-check-fix
Applying: mm/fork: fix overflow in vma length when copying mmap on clone
Applying: mm/vmstat.c: remov debug fs entries on failure of file creation and made extfrag_debug_root dentry local
Applying: memcg: fix/change behavior of shared anon at moving task
Applying: memcg swap: mem_cgroup_move_swap_account never needs fixup
Applying: memcg swap: use mem_cgroup_uncharge_swap()
Applying: mm/memcg: scanning_global_lru means mem_cgroup_disabled
Applying: mm/memcg: move reclaim_stat into lruvec
Applying: mm: push lru index into shrink_[in]active_list()
Applying: mm-push-lru-index-into-shrink_active_list-fix
Applying: mm: mark mm-inline functions as __always_inline
Applying: mm: remove lru type checks from __isolate_lru_page()
Applying: mm/memcg: kill mem_cgroup_lru_del()
Applying: memcg: mark more functions/variables as static
Applying: memcg: remove unused variable
Applying: memcg: mark stat field of mem_cgroup struct as __percpu
Applying: memcg: remove redundant parentheses
Applying: memcg: make threshold index in the right position
Applying: memcg: revise the position of threshold index while unregistering event
Applying: mm/memcg: use vm_swappiness from target memory cgroup
Applying: security/keys/keyctl.c: suppress memory allocation failure warning
Applying: frv: use set_current_blocked() and block_sigmask()
Applying: um/kernel/trap.c: port OOM changes to handle_page_fault()
Applying: sgi-xp: use lockdep_assert_held()
Applying: drivers/scsi/aha152x.c: remove broken usage of spin_is_locked()
Applying: XFS: fix lock ASSERT on UP
Applying: mm/huge_memory.c: use lockdep_assert_held()
Applying: futex: use lockdep_assert_held() for lock checking
Applying: drivers/net/irda/sir_dev.c: remove spin_is_locked()
Applying: drivers/net/ethernet/smsc/smsc911x.h: use lockdep_assert_held() instead of home grown buggy construct
Applying: spinlocks.txt: add a discussion on why spin_is_locked() is bad
Applying: spinlockstxt-add-a-discussion-on-why-spin_is_locked-is-bad-fix
Applying: include/linux/spinlock.h: add a kerneldoc comment to spin_is_locked() that discourages its use
Applying: checkpatch: check for spin_is_locked()
Applying: CodingStyle: add kmalloc_array() to memory allocators
Applying: parisc: use set_current_blocked() and block_sigmask()
Applying: introduce SIZE_MAX
Applying: sethostname/setdomainname: notify userspace when there is a change in uts_kern_table
Applying: vsprintf: correctly handle width when '#' flag used in %#p format.
Applying: vsprintf-correctly-handle-width-when-flag-used-in-%p-format-checkpatch-fixes
Applying: vsprintf: further optimize decimal conversion
Applying: vsprintf-further-optimize-decimal-conversion-v2
Applying: vsprintf-further-optimize-decimal-conversion-checkpatch-fixes
Applying: hamradio/scc: orphan driver in MAINTAINERS
Applying: MAINTAINERS: remove Alessandro
Applying: blacklight: remove redundant spi driver bus initialization
Applying: lcd: add callbacks for early fb event blank support
Applying: fbdev: add events for early fb event support
Applying: drivers/leds/leds-lp5521.c: fix lp5521_read() error handling
Applying: leds: driver for DA9052/53 PMIC v2
Applying: leds-led-module-for-da9052-53-pmic-v2-fix
Applying: leds: add LED driver for lm3556 chip
Applying: leds-add-led-driver-for-lm3556-chip-checkpatch-fixes
Applying: leds: lm3556: Don't call kfree for the memory allocated by devm_kzalloc
Applying: leds: simple_strtoul() cleanup
Applying: leds: Use kcalloc instead of kzalloc to allocate array
Applying: leds: add new field to led_classdev struct to save activation state
Applying: leds: change existing triggers to use activated flag
Applying: leds: change ledtrig-timer to use activated flag
Applying: include/linux/led-lm3530.h: comment correction about the range of brightness
Applying: drivers/leds/leds-lm3530.c: simplify als configuration on initialization
Applying: leds: heartbeat: stop on shutdown
Applying: leds-heartbeat-stop-on-shutdown-checkpatch-fixes
Applying: list_debug: WARN for adding something already in the list
Applying: lib/test-kstrtox.c: mark const init data with __initconst instead of __initdata
Applying: lib/string_helpers.c: make arrays static
Applying: lib/bitmap.c: fix documentation for scnprintf() functions
Applying: vsprintf: fix %ps on non symbols when using kallsyms
Applying: spinlock_debug: print kallsyms name for lock
Applying: checkpatch: suggest pr_<level> over printk(KERN_<LEVEL>
Applying: rtc/spear: add Device Tree probing capability
Applying: drivers/rtc/rtc-ep93xx.c: convert to use module_platform_driver()
Applying: rtc: add ioctl to get/clear battery low voltage status
Applying: drivers/rtc/rtc-pcf8563.c: add RTC_VL_READ/RTC_VL_CLR ioctl feature
Applying: drivers/rtc/Kconfig: place RTC_DRV_IMXDI and RTC_MXC under "on-CPU RTC drivers"
Applying: rtc: rename CONFIG_RTC_MXC to CONFIG_RTC_DRV_MXC
Applying: rtc-rename-config_rtc_mxc-to-config_rtc_drv_mxc-fix
Applying: rtc: ds1307: remove superfluous initialization
Applying: rtc: ds1307: add trickle charger support
Applying: drivers/rtc/rtc-m41t93.c: don't let get_time() reset M41T93_FLAG_OF
Applying: HPFS: remove PRINTK() macro
Applying: kmod: unexport call_usermodehelper_freeinfo()
Applying: kmod: convert two call sites to call_usermodehelper_fns()
Applying: kmod: move call_usermodehelper_fns() to .c file and unexport all it's helpers
Applying: kmod.c: fix kernel-doc warning
Applying: kmod: avoid deadlock from recursive kmod call
Applying: cred: remove task_is_dead() from __task_cred() validation
Applying: stack usage: add pid to warning printk in check_stack_usage
Applying: proc: clean up /proc/<pid>/environ handling
Applying: proc-clean-up-proc-pid-environ-handling-checkpatch-fixes
Applying: proc: unify ptrace_may_access() locking code
Applying: proc: remove mm_for_maps()
Applying: proc: use mm_access() instead of ptrace_may_access()
Applying: proc: don't do dummy rcu_read_lock/rcu_read_unlock on error path
Applying: proc: pass "fd" by value in /proc/*/{fd,fdinfo} code
Applying: procfs: use more apprioriate types when dumping /proc/N/stat
Applying: proc: use IS_ERR_OR_NULL()
Applying: fork: call complete_vfork_done() after clearing child_tid and flushing rss-counters
Applying: ipc/sem.c: alternatives to preempt_disable()
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: mqueue: revert bump up DFLT_*MAX
Applying: mqueue: don't use kmalloc with KMALLOC_MAX_SIZE
Applying: mqueue: separate mqueue default value from maximum value
Applying: selftests: add mq_open_tests
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
Applying: eventfd: change int to __u64 in eventfd_signal()
Applying: eventfd-change-int-to-__u64-in-eventfd_signal-fix
Applying: w1: fix ds28e04 build, select CRC16
Applying: aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
Applying: sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
Applying: fs, proc: introduce /proc/<pid>/task/<tid>/children entry
Applying: syscalls, x86: add __NR_kcmp syscall
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8 comment update
Applying: syscalls-x86-add-__nr_kcmp-syscall-v8-comment-update-fix
Applying: c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
Applying: c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
Applying: c/r: prctl: simplify PR_SET_MM on mm::code/data assignment
Applying: c/r: prctl: return -EFAULT instead of -EINVAL in case if underlied VMA is not found
Applying: c/r: prctl: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: update prctl_set_mm_exe_file() after mm->num_exe_file_vmas removal
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: kconfig: update compression algorithm info
Applying: notify_change(): check that i_mutex is held
Applying: ipc/mqueue: using vmalloc requires including vmalloc.h
Merging akpm (caef8f1 ipc/mqueue: using vmalloc requires including vmalloc.h)
[master f0304a7] Revert "net/l2tp: add support for L2TP over IPv6 UDP"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the final tree (net-next tree related)
From: Stephen Rothwell @ 2012-04-30 5:58 UTC (permalink / raw)
To: David Miller, netdev; +Cc: linux-next, linux-kernel, Benjamin LaHaise
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
Hi all,
After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:
net/l2tp/l2tp_core.c: In function 'l2tp_verify_udp_checksum':
net/l2tp/l2tp_core.c:464:7: error: implicit declaration of function 'csum_ipv6_magic' [-Werror=implicit-function-declaration]
Caused by commit d2cf3361677e ("net/l2tp: add support for L2TP over IPv6
UDP"). Include file missing.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build warning after merge of the hid tree
From: Stephen Rothwell @ 2012-04-30 4:05 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
Hi Jiri,
After merging the hid tree, today's linux-next build (powerpc
ppc64_defconfig) produced this warning:
In file included from drivers/hid/hid-core.c:37:0:
include/linux/hidraw.h: In function 'hidraw_report_event':
include/linux/hidraw.h:85:46: warning: no return statement in function returning non-void [-Wreturn-type]
Introduced by commit b6787242f327 ("HID: hidraw: add proper error
handling to raw event reporting").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: build failure after merge of the drm tree
From: Stephen Rothwell @ 2012-04-30 3:22 UTC (permalink / raw)
To: Dave Airlie
Cc: linux-next, linux-kernel, Adam Jackson, Alex Deucher,
Chris Wilson
[-- Attachment #1: Type: text/plain, Size: 698 bytes --]
Hi Dave,
After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
drivers/gpu/drm/drm_edid_load.c: In function 'edid_load':
drivers/gpu/drm/drm_edid_load.c:176:2: error: too few arguments to function 'drm_edid_block_valid'
include/drm/drm_crtc.h:1015:13: note: declared here
drivers/gpu/drm/drm_edid_load.c:188:3: error: too few arguments to function 'drm_edid_block_valid'
Caused by commit f89ec8a456dd ("drm/edid: Try harder to fix up base EDID
blocks"). drivers/gpu/drm/drm_edid_load.c was added before v3.4-rc1 ...
grep is your friend.
I have used the drm tree from next-20120427 for today.
--
Stephen Rothwell <sfr@canb.auug.org.au>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Aneesh Kumar K.V @ 2012-04-28 18:01 UTC (permalink / raw)
To: Andrew Morton, David Rientjes
Cc: Randy Dunlap, Stephen Rothwell, linux-next, linux-kernel,
Richard Weinberger, KAMEZAWA Hiroyuki
In-Reply-To: <20120427143646.8209627e.akpm@linux-foundation.org>
Andrew Morton <akpm@linux-foundation.org> writes:
> On Fri, 27 Apr 2012 14:27:13 -0700 (PDT)
> David Rientjes <rientjes@google.com> wrote:
>
>> On Fri, 27 Apr 2012, Andrew Morton wrote:
>>
>> > Seems reasonable. But the CONFIG_HUGETLB_PAGE=y,
>> > CONFIG_MEM_RES_CTLR_HUGETLB=n combination will cause unneeded code
>> > generation and space consumption in memcontrol.c.
>> >
>> > I wonder if we can additionally do, within memcontrol.c:
>> >
>> > /*
>> > * Nice comment goes here
>> > */
>> > #ifdef CONFIG_MEM_RES_CTLR_HUGETLB
>> > #define HUGE_MAX_HSTATE_FOO HUGE_MAX_HSTATE
>> > #else
>> > #define HUGE_MAX_HSTATE_FOO 0
>> > #endif
>> >
>> > and s/HUGE_MAX_HSTATE/HUGE_MAX_HSTATE_FOO/ in that file.
>> >
>>
>> I haven't looked at the hugetlb memcg controller in-depth (yet), but I
>> really think we should start considering breaking things like this off
>> into its own cgroup. The hugetlb extension seems like something that
>> could be easily separtated, but perhaps I'm saying "easily" because I
>> haven't looked at the implementation.
>>
>> mm/memcontrol.c in linux-next is 5877 lines and, if history is any guide,
>> it's going to continue growing.
>>
>> If the hugetlb usage isn't charged against the memcg's
>> memory.usage_in_bytes like thp is, then I really think it should be its
>> own cgroup. From the hugetlb perspective absent any cgroups, things like
>> hstates (since we're talking about HUGE_MAX_HSTATE) are global resources
>> and so you'd need to preallocate these on the command line or via sysfs
>> before you could mmap them. So if my assumption that the hugetlb memcg
>> controller is only governing these global resources and charging a set of
>> tasks for what they use, then it really has no business in mm/memcontrol.c
>> to begin with, in my opinion.
>
My first version was to do it as a seperate controller
http://thread.gmane.org/gmane.linux.kernel.mm/73826
But the feedback I received was to do it as a part of memcg extension,
because what the controller is limiting is memory albeit a different
type. AFAIU there is also this goal of avoiding controller proliferation.
-aneesh
^ permalink raw reply
* Re: inux-next: Tree for Apr 27 (uml + mm/memcontrol.c)
From: Randy Dunlap @ 2012-04-28 0:45 UTC (permalink / raw)
To: David Rientjes
Cc: Andrew Morton, Stephen Rothwell, linux-next, linux-kernel,
Richard Weinberger, Aneesh Kumar K.V, KAMEZAWA Hiroyuki
In-Reply-To: <alpine.DEB.2.00.1204271141040.28516@chino.kir.corp.google.com>
On 04/27/2012 11:44 AM, David Rientjes wrote:
> On Fri, 27 Apr 2012, Randy Dunlap wrote:
>
>> On 04/26/2012 11:11 PM, Stephen Rothwell wrote:
>>
>>> Hi all,
>>>
>>> Changes since 20120424:
>>
>>
>>
>> uml on x86_64 (defconfig):
>>
>> mm/memcontrol.c:256:30: error: 'HUGE_MAX_HSTATE' undeclared here (not in a function)
>>
>
> This is because of "memcg: add HugeTLB extension" from -mm.
>
> This patch is legal in C99, I wonder if Andrew would let us get away with
> something like this so there's no a dozen #ifdefs in mm/memcontrol.c?
Well, that works, but no S-O-B and no Ack.
> ---
> diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
> --- a/arch/powerpc/include/asm/page.h
> +++ b/arch/powerpc/include/asm/page.h
> @@ -39,13 +39,13 @@
> #ifndef __ASSEMBLY__
> #ifdef CONFIG_HUGETLB_PAGE
> extern unsigned int HPAGE_SHIFT;
> +#define HUGE_MAX_HSTATE (MMU_PAGE_COUNT-1)
> #else
> #define HPAGE_SHIFT PAGE_SHIFT
> #endif
> #define HPAGE_SIZE ((1UL) << HPAGE_SHIFT)
> #define HPAGE_MASK (~(HPAGE_SIZE - 1))
> #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
> -#define HUGE_MAX_HSTATE (MMU_PAGE_COUNT-1)
> #endif
>
> /* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
> diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h
> --- a/arch/tile/include/asm/page.h
> +++ b/arch/tile/include/asm/page.h
> @@ -136,9 +136,8 @@ static inline __attribute_const__ int get_order(unsigned long size)
>
> #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
>
> -#define HUGE_MAX_HSTATE 6
> -
> #ifdef CONFIG_HUGETLB_PAGE
> +#define HUGE_MAX_HSTATE 6
> #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
> #endif
>
> diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
> --- a/arch/x86/include/asm/page_types.h
> +++ b/arch/x86/include/asm/page_types.h
> @@ -25,7 +25,9 @@
> #define HPAGE_MASK (~(HPAGE_SIZE - 1))
> #define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)
>
> +#ifdef CONFIG_HUGETLB_PAGE
> #define HUGE_MAX_HSTATE 2
> +#endif
>
> #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -324,6 +324,7 @@ static inline int hstate_index(struct hstate *h)
>
> #else
> struct hstate {};
> +#define HUGE_MAX_HSTATE 0
> #define alloc_huge_page_node(h, nid) NULL
> #define alloc_bootmem_huge_page(h) NULL
> #define hstate_file(f) NULL
--
~Randy
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox