* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-13 2:30 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Johannes Berg, David Miller, netdev,
Meenakshi Venkataraman
[-- Attachment #1: Type: text/plain, Size: 2183 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-testmode.c between commit d33e152e1edd
("iwlwifi: Stop using NLA_PUT*()") from the net-next tree and commits
11483b5c2296 ("iwlwifi: move eeprom into priv") and a42506eb27aa
("iwlwifi: move ucode_type from shared to op_mode") from the
wireless-next tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/wireless/iwlwifi/iwl-testmode.c
index a54e20e,c8e89ca..0000000
--- a/drivers/net/wireless/iwlwifi/iwl-testmode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-testmode.c
@@@ -540,12 -539,11 +543,12 @@@ static int iwl_testmode_driver(struct i
IWL_ERR(priv, "Memory allocation fail\n");
return -ENOMEM;
}
- NLA_PUT_U32(skb, IWL_TM_ATTR_COMMAND,
- IWL_TM_CMD_DEV2APP_EEPROM_RSP);
- NLA_PUT(skb, IWL_TM_ATTR_EEPROM,
- cfg(priv)->base_params->eeprom_size,
- priv->eeprom);
+ if (nla_put_u32(skb, IWL_TM_ATTR_COMMAND,
+ IWL_TM_CMD_DEV2APP_EEPROM_RSP) ||
+ nla_put(skb, IWL_TM_ATTR_EEPROM,
+ cfg(priv)->base_params->eeprom_size,
- priv->shrd->eeprom))
++ priv->eeprom))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n",
@@@ -609,10 -605,9 +612,10 @@@
inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
}
- if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type) ||
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
- NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
++ if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->ucode_type) ||
+ nla_put_u32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size) ||
+ nla_put_u32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size))
+ goto nla_put_failure;
status = cfg80211_testmode_reply(skb);
if (status < 0)
IWL_ERR(priv, "Error sending msg : %d\n", status);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-13 2:41 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Samuel Ortiz, David Miller, netdev
[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]
Hi John,
Today's linux-next merge of the wireless-next tree got a semantic
conflict in net/nfc/netlink.c between commit b3fe91c53a0a ("netlink:
Delete all NLA_PUT*() macros") from the net-next tree and commit
8112a5c91d78 ("NFC: Add a target lost netlink event") from the
wireless-next tree.
I added the below merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 13 Apr 2012 12:34:10 +1000
Subject: [PATCH] NFC: fix up for NLA_PUT_ api changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/nfc/netlink.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 539d041..24d8d12 100644
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -202,8 +202,10 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
if (!hdr)
goto free_msg;
- NLA_PUT_STRING(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev));
- NLA_PUT_U32(msg, NFC_ATTR_TARGET_INDEX, target_idx);
+ if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)))
+ goto nla_put_failure;
+ if (nla_put_u32((msg, NFC_ATTR_TARGET_INDEX, target_idx))
+ goto nla_put_failure;
genlmsg_end(msg, hdr);
--
1.7.10.rc3
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related
* Re: linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-13 2:49 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Samuel Ortiz, David Miller, netdev
In-Reply-To: <20120413124103.5bc632a6425ea9da9c5c4aae@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 798 bytes --]
Hi John,
On Fri, 13 Apr 2012 12:41:03 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
> index 539d041..24d8d12 100644
> --- a/net/nfc/netlink.c
> +++ b/net/nfc/netlink.c
> @@ -202,8 +202,10 @@ int nfc_genl_target_lost(struct nfc_dev *dev, u32 target_idx)
> if (!hdr)
> goto free_msg;
>
> - NLA_PUT_STRING(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev));
> - NLA_PUT_U32(msg, NFC_ATTR_TARGET_INDEX, target_idx);
> + if (nla_put_string(msg, NFC_ATTR_DEVICE_NAME, nfc_device_name(dev)))
> + goto nla_put_failure;
> + if (nla_put_u32((msg, NFC_ATTR_TARGET_INDEX, target_idx))
^
I removed this extra parenthesis. :-(
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the wireless-next tree with the net-next tree
From: Stephen Rothwell @ 2012-04-13 2:51 UTC (permalink / raw)
To: John W. Linville
Cc: linux-next, linux-kernel, Johannes Berg, David Miller, netdev,
Meenakshi Venkataraman
In-Reply-To: <20120413123055.8d25d96b3d3c055b726b8519@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
Hi John,
On Fri, 13 Apr 2012 12:30:55 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> @@@ -609,10 -605,9 +612,10 @@@
> inst_size = img->sec[IWL_UCODE_SECTION_INST].len;
> data_size = img->sec[IWL_UCODE_SECTION_DATA].len;
> }
> - if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->shrd->ucode_type) ||
> - NLA_PUT_U32(skb, IWL_TM_ATTR_FW_TYPE, priv->cur_ucode);
> - NLA_PUT_U32(skb, IWL_TM_ATTR_FW_INST_SIZE, inst_size);
> - NLA_PUT_U32(skb, IWL_TM_ATTR_FW_DATA_SIZE, data_size);
> ++ if (nla_put_u32(skb, IWL_TM_ATTR_FW_TYPE, priv->ucode_type) ||
^^^^^^^^^^
That should have been "cur_ucode", of course :-(
--
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: linux-next: boot failures with next-20120411
From: Stephen Rothwell @ 2012-04-13 2:57 UTC (permalink / raw)
To: Michael Neuling; +Cc: Jiri Slaby, Greg Kroah-Hartman, LKML, ppc-dev, linux-next
In-Reply-To: <16710.1334284211@neuling.org>
[-- Attachment #1: Type: text/plain, Size: 661 bytes --]
Hi all,
On Fri, 13 Apr 2012 12:30:11 +1000 Michael Neuling <mikey@neuling.org> wrote:
>
> I managed to bisect this down using pseries_defconfig with next-20120412
> to this patch:
>
> commit 85bbc003b24335e253a392f6a9874103b77abb36
> Author: Jiri Slaby <jslaby@suse.cz>
> Date: Mon Apr 2 13:54:22 2012 +0200
>
> TTY: HVC, use tty from tty_port
Thanks for that, Mikey.
> Reverting this commit (and 0146b6939074ebe14ece3604fd00e7be128a3812
> otherwise git barfs) fixes the problem on next-20120412.
I will revert those commits form linux-next today.
--
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 drm tree with Linus' tree
From: Stephen Rothwell @ 2012-04-13 3:38 UTC (permalink / raw)
To: Dave Airlie; +Cc: linux-next, linux-kernel, Daniel Vetter, Daniel Kurtz
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_i2c.c between commit 6a562e3daee2 ("Revert
"drm/i915: reenable gmbus on gen3+ again"") from Linus' tree and commits
0fb3f969c868 ("drm/i915: enable gmbus on gen2") and 2ed06c93a1fc
("drm/i915/intel_i2c: gmbus disabled and reserved ports are invalid")
from the drm tree.
I just used the drm tree version.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: Tree for Apr 13
From: Stephen Rothwell @ 2012-04-13 5:31 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 29208 bytes --]
Hi all,
Changes since 20120412:
The devicetree-current tree still had its build failure so I used the
version from next-20120410.
The v4l-dvb tree still had its build failure so I used the version from
next-20120410.
The wireless-next tree gained conflicts against the net-next tree.
The drm tree gained a conflict against Linus' tree.
I reverted 2 commits from the tty tree to fix a boot failure.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 188 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 (7c427f4 Merge tag 'usb-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
Merging fixes/master (b1a808f Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi)
Merging kbuild-current/rc-fixes (0eb043d Subject: [PATCH] tags.sh: Add missing quotes)
Merging arm-current/fixes (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
Merging m68k-current/for-linus (450aed7 m68k/q40: Add missing platform check before registering platform devices)
Merging powerpc-merge/merge (fae2e0f powerpc: Fix typo in runlatch code)
Merging sparc/master (d657784 sparc32,leon: fix leon build)
Merging scsi-rc-fixes/master (41f8ad7 [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576)
Merging net/master (ecca5c3 Merge branch 'akpm' (Andrew's patch-bomb))
Merging sound-current/for-linus (29ebe40 ALSA: hda/realtek - Add quirk for Mac Pro 5,1 machines)
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 (b4838d1 NFC: Fix the LLCP Tx fragmentation loop)
Merging driver-core.current/driver-core-linus (282029c kobject: provide more diagnostic info for kobject_add_internal() failures)
Merging tty.current/tty-linus (11bbd5b pch_uart: Add Kontron COMe-mTT10 uart clock quirk)
Merging usb.current/usb-linus (9de2922 USB: update usbtmc api documentation)
Merging staging.current/staging-linus (474a898 staging: android: fix mem leaks in __persistent_ram_init())
Merging char-misc.current/char-misc-linus (0034102 Linux 3.4-rc2)
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 (0e3d0f3 Input: da9052 - fix memory leak in da9052_onkey_probe())
Merging md-current/for-linus (afbaa90 md/bitmap: prevent bitmap_daemon_work running while initialising bitmap)
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 (691c01c arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible)
Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
Merging devicetree-current/devicetree/merge (e46c11b of/irq: add empty irq_of_parse_and_map() for non-dt builds)
$ git reset --hard HEAD^
Merging refs/next/20120410/devicetree-current
Merging spi-current/spi/merge (39ec0d3 spi/imx: prevent NULL pointer dereference in spi_imx_probe())
Merging gpio-current/gpio/merge (9a5c7d6 gpio/exynos: Fix compiler warning in gpio-samsung.c file)
Merging arm/for-next (b2bc9e0 ARM: 7366/1: amba: Remove AMBA level regulator support)
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 (1ef2f17 Merge branch 'next/cleanup-samsung-iommu' into for-next)
Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
Merging blackfin/for-linus (35fe2e7 blackfin: update defconfig for bf527-ezkit)
Merging c6x/for-linux-next (fde7d90 Linux 3.3-rc7)
Merging cris/for-next (9c75fc8 CRIS: Remove legacy RTC drivers)
Merging quilt/hexagon (110b372 Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h)
CONFLICT (content): Merge conflict in arch/hexagon/Kconfig
Merging ia64/next (16f2634 [IA64] Normalize return value of chip->irq_set_affinity() method)
Merging m68k/for-next (03c63c1 m68k/mm: Port OOM changes to do_page_fault())
Merging m68knommu/for-next (de6bd4f m68k: merge the MMU and non-MMU signal.c code)
Merging microblaze/next (258f742 modpost: Fix modpost license checking of vmlinux.o)
Merging mips/mips-for-linux-next (2fea377 Merge branch 'fixes-for-linus' 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 (b5594a7 powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board)
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 (affbb42 [S390] Fix compile error in swab.h)
Merging sh/sh-latest (ee56510 MAINTAINERS: Update git URL for SH.)
Merging sparc-next/master (e9b57cc sparc: Use vsprintf extention %pf with builtin_return_address)
Merging tile/master (a46bf6d arch/tile: tilegx PCI root complex support)
Merging unicore32/unicore32 (0994695 Merge branch 'akpm' (aka "Andrew's patch-bomb, take two"))
Merging ceph/master (c666601 rbd: move snap_rwsem to the device, rename to header_rwsem)
Merging cifs/master (4fe9e96 Cleanup handling of NULL value passed for a mount option)
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 (c2d9fae ext2: Remove s_dirt handling)
Merging ext4/dev (9d547c3 vfs: remove unused superblock helpers)
Merging fuse/for-next (c628ee6 fuse: use flexible array in fuse.h)
Merging gfs2/master (c9b17f7 GFS2: Use variable rather than qa to determine if unstuff necessary)
Merging logfs/master (cd8bfa9 logfs: initialize the number of iovecs in bio)
Merging nfs/linux-next (f30fb85 NFS: check for req==NULL in nfs_try_to_update_request cleanup)
Merging nfsd/nfsd-next (e3f70ea Lockd: pass network namespace to creation and destruction routines)
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 (0034102 Linux 3.4-rc2)
Merging xfs/for-next (0034102 Linux 3.4-rc2)
Merging vfs/for-next (07c0c5d ext4: initialization of ext4_li_mtx needs to be done earlier)
Merging pci/next (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
Merging hid/for-next (2c8cee0 Merge branches 'logitech', 'wacom' and 'waltop' 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 (bbceeee i2c-eg20t: Remove write-only variables)
Merging quilt/jdelvare-hwmon (e3a9568 hwmon: Add MCP3021 ADC driver)
Merging hwmon-staging/hwmon-next (09b4bf6 acpi_power_meter: clean up code around setup_attrs)
Merging v4l-dvb/master (eb56984 Merge /home/v4l/v4l/for_upstream)
$ git reset --hard HEAD^
Merging refs/next/20120410/v4l-dvb
Merging kbuild/for-next (51cbc3e 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 (b8cec3c pata_cmd64x: implement sff_irq_check() method)
Merging infiniband/for-next (c72adfd be2net: Add functionality to support RoCE driver)
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 (19f8399 Merge branch 'iso-flush' into for-next)
Merging ubi/linux-next (0034102 Linux 3.4-rc2)
Merging dlm/next (1b189b8 dlm: last element of dlm_local_addr[] never used)
Merging scsi/master (6993169 [SCSI] ipr: Driver version 2.5.3)
Merging target-updates/for-next (187e70a ib_srpt: Fix srpt_handle_cmd send_ioctx->ioctx_kref leak on exception)
Merging target-merge/for-next-merge (06de5ee tcm_qla2xxx: Add >= 24xx series fabric module for target-core)
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
Merging isci/all (fbabacb Merge branches 'devel', 'rnc-devel' and 'fixes' into all)
Merging slave-dma/next (91ae1e3 dmaengine: mxs-dma: assign cookie in prepare)
Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
Merging net-next/master (011e3c6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
Merging wireless-next/master (e967669 iwlwifi: dynamically determine lib_ops)
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-testmode.c
Applying: cfg80211: NLA_PUT_U32 api change merge fix
Applying: NFC: fix up for NLA_PUT_ api changes
Merging bluetooth/master (205f56e Bluetooth: Functions for handling ERTM control fields)
Merging mtd/master (7b0e67f mtd: docg3 add protection against concurrency)
Merging l2-mtd/master (711ab3a sh: Use the plat_nand default partition parser)
Merging crypto/master (d788fec crypto, xor: Sanitize checksumming function selection output)
Merging sound/for-next (9bdde1e Merge branch 'fix/hda' into for-next)
Merging sound-asoc/for-next (975338b Merge branch 'for-3.4' 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/kprobes.c
Merging input/next (b5e9528 Input: ep93xx_keypad - switch to using dev_pm_ops)
Merging input-mt/for-next (0034102 Linux 3.4-rc2)
Merging cgroup/for-next (86f82d5 cgroup: remove cgroup_subsys->populate())
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging block/for-next (f52b69f Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh)
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 (a334b95 mmc: remove imxmmc driver)
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 (54800d2 lib/raid6: fix test program build)
Merging mfd/for-next (b8589e2 gpio/twl: Add DT support to gpio-twl4030 driver)
Merging battery/master (5cdd4d7 max17042_battery: Clean up interrupt handling)
Merging drm/drm-next (ae85226 agp: Use u32 __iomem annotation to silence sparse warning.)
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_i2c.c
Merging fbdev/fbdev-next (688ec34 video: pxa3xx-gcu: Simplify the logic to exit while loop in pxa3xx_gcu_wait_idle)
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 (cf0ff3d Merge branch 'regulator-drivers' into regulator-next)
Merging security/next (9ccf010 maintainers: update wiki url for the security subsystem)
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 (0034102 Linux 3.4-rc2)
Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
Merging iommu/next (7de4730 Merge branches 'iommu/fixes', 'arm/tegra' and 'x86/amd' 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 (b3aa158 workqueue: Fix workqueue_execute_end() comment)
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
Merging pm/linux-next (c4772d1 PM / QoS: add pm_qos_update_request_timeout() API)
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 (6810d77 spi/devicetree: Move devicetree support code into spi directory)
Merging tip/auto-latest (911bcb2 Merge branch 'linus')
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging rcu/rcu/next (1cc8596 rcu: Stop spurious warnings from synchronize_sched_expedited)
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 (d65b4e9 Linux 3.3-rc3)
Merging kvm/linux-next (e087592 KVM: Resolve RCU vs. async page fault problem)
Merging oprofile/for-next (c16fa4f Linux 3.3)
Merging xen/upstream/xen (59e9a6b Merge branch 'upstream/ticketlock-cleanup' into upstream/xen)
CONFLICT (content): Merge conflict in arch/x86/include/asm/cmpxchg.h
Merging xen-two/linux-next (2efe928 Merge branch 'stable/for-linus-3.4' into linux-next)
CONFLICT (content): Merge conflict in arch/x86/kernel/apic/io_apic.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/io_apic.h
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
Merging percpu/for-next (adb7950 percpu: fix __this_cpu_{sub,inc,dec}_return() definition)
Merging workqueues/for-next (d3283fb trace: Remove unused workqueue tracer)
Merging drivers-x86/linux-next (86924de acer-wmi: add quirk table for video backlight vendor mode)
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 (8f1e125 w1: Disable irqs during 1-wire bus operations, extend 1-wire reset pulse)
Merging tty/tty-next (59d59b0 ISDN: remove uses of isdn_tty_revision)
[master fecc1da] Revert "TTY: HVC, use count from tty_port"
[master 7507ab4] Revert "TTY: HVC, use tty from tty_port"
Merging usb/usb-next (af58105 USB: io_ti: fix abuse of interface data)
Merging staging/staging-next (b330f60 staging: replace open-coded ARRAY_SIZEs)
Merging char-misc/char-misc-next (0034102 Linux 3.4-rc2)
Merging tmem/linux-next (9c9fc31 Merge commit 'e22057c8599373e5caef0bc42bdb95d2a361ab0d' into linux-next)
Merging writeback/writeback-for-next (697e6fe writeback: Remove outdated comment)
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 (ec25b77 pinctrl: tegra: Add complete device tree support)
Merging tegra/for-next (8ab2cf3 Merge branch 'for-3.5/debug' into for-next)
Merging moduleh/for-sfr (ed93e94 ia64: populate the cmpxchg header with appropriate code)
Merging vhost/linux-next (437578b virtio-pci: switch to PM ops macro to initialise PM functions)
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)
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 (409a6f6 Merge branch 'irqdomain-for-grant' of git://sources.calxeda.com/kernel/linux into irqdomain/next)
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging gpio/gpio/next (f141ed6 gpio: Move DT support code into drivers/gpio)
Merging arm-soc/for-next (ce9f68e Merge branch 'fixes' into for-next)
CONFLICT (content): Merge conflict in drivers/mmc/host/Kconfig
Merging kvmtool/master (63091b3 kvm tools: Drop unnecessary headers in barrier.h)
Merging dma-mapping/dma-mapping-next (0034102 Linux 3.4-rc2)
Merging dma-buf/for-next (9f28056 dma-buf: Correct dummy function declarations.)
CONFLICT (content): Merge conflict in include/linux/dma-buf.h
Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
Merging cpuidle-cons/cpuidle_consol_pull (203b52e SH: shmobile: Consolidate time keeping and irq enable)
CONFLICT (content): Merge conflict in include/linux/cpuidle.h
CONFLICT (content): Merge conflict in drivers/cpuidle/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-davinci/cpuidle.c
CONFLICT (content): Merge conflict in arch/arm/mach-at91/cpuidle.c
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/cpuidle.h
Merging scsi-post-merge/merge-base:master ()
$ git checkout akpm
Applying: acerhdf: add support for Aspire 1410 BIOS v1.3314
Applying: acerhdf: add support for new hardware
Applying: acerhdf: lowered default temp fanon/fanoff values
Applying: umem: fix up unplugging
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: arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file
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: MIPS: 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: 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: 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: vmscan: remove lumpy reclaim
Applying: mm: vmscan: remove reclaim_mode_t
Applying: mm: remove swap token code
Applying: mm: add extra free kbytes tunable
Applying: mm-add-extra-free-kbytes-tunable-update
Applying: mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes
Applying: memcg: 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: block: use lockdep_assert_held() for queue locking
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: parisc: use set_current_blocked() and block_sigmask()
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: 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: simple_strtoul() cleanup
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: 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: 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: avoid deadlock from recursive kmod call
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: use IS_ERR_OR_NULL()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: rapidio: add DMA engine support for RIO data transfers
Applying: rapidio/tsi721: add DMA engine support
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: add ability to set new mm_struct::exe_file
Applying: c/r: prctl: add ability to get clear_tid_address
Applying: c/r: ipc: message queue receive cleanup
Applying: c/r: ipc: message queue stealing feature introduced
Applying: ramoops: use pstore interface
Applying: ramoops: fix printk format warnings
Applying: notify_change(): check that i_mutex is held
Merging akpm (1810cfc notify_change(): check that i_mutex is held)
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: boot failures with next-20120411
From: Jiri Slaby @ 2012-04-13 8:02 UTC (permalink / raw)
To: Michael Neuling
Cc: Stephen Rothwell, Greg Kroah-Hartman, LKML, ppc-dev, linux-next,
Jiri Slaby
In-Reply-To: <16710.1334284211@neuling.org>
[-- Attachment #1: Type: text/plain, Size: 3609 bytes --]
On 04/13/2012 04:30 AM, Michael Neuling wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi all,
>>
>> Some (not all) of my PowerPC boot tests have failed like this after
>> getting into user mode (this one was just after udev started, but others
>> are after other processes getting going):
>>
>> Unable to handle kernel paging request for data at address 0xc0000003f9d550
>> Faulting instruction address: 0xc0000000001b7f40
>> Oops: Kernel access of bad area, sig: 11 [#1]
>> SMP NR_CPUS=32 NUMA pSeries
>> Modules linked in: ehea
>> NIP: c0000000001b7f40 LR: c0000000001b7f14 CTR: c0000000000e04f0
>> REGS: c0000003f68bf6b0 TRAP: 0300 Not tainted (3.4.0-rc2-autokern1)
>> MSR: 800000000280b032 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI> CR: 24422424 XER: 20000001
>> SOFTE: 1
>> CFAR: 000000000000562c
>> DAR: 00c0000003f9d550, DSISR: 40000000
>> TASK = c0000003f8818000[3192] 'kdump' THREAD: c0000003f68bc000 CPU: 5
>> GPR00: 0000000000000000 c0000003f68bf930 c000000000ce1d40 c0000003fe00ec00
>> GPR04: 00000000000002d0 0000000000000038 c0000003f8f935e8 c000000000e55280
>> GPR08: 0000000000000011 c000000000bcb280 c000000000bcb1e8 000000000028a000
>> GPR12: 0000000024422424 c00000000f33bc80 00000fffdd90a770 0000000000081000
>> GPR16: c0000003f846c000 000000000de4f7a0 f00000000de4f7a0 0000000000000000
>> GPR20: c0000003f8365408 c0000003f8365480 c0000003f8e5d110 0000000000000000
>> GPR24: 0000000000000100 c0000003f8365400 c0000000001e5424 00000000000002d0
>> GPR28: 0000000000000800 00c0000003f9d550 c000000000c5b718 c0000003fe00ec00
>> NIP [c0000000001b7f40] .__kmalloc+0x70/0x230
>> LR [c0000000001b7f14] .__kmalloc+0x44/0x230
>> Call Trace:
>> [c0000003f68bf930] [c0000003f68bf9b0] 0xc0000003f68bf9b0 (unreliable)
>> [c0000003f68bf9e0] [c0000000001e5424] .alloc_fdmem+0x24/0x70
>> [c0000003f68bfa60] [c0000000001e54f8] .alloc_fdtable+0x88/0x130
>> [c0000003f68bfaf0] [c0000000001e5924] .dup_fd+0x384/0x450
>> [c0000003f68bfbd0] [c00000000009a310] .copy_process+0x880/0x11d0
>> [c0000003f68bfcd0] [c00000000009aee0] .do_fork+0x70/0x400
>> [c0000003f68bfdc0] [c0000000000141c4] .sys_clone+0x54/0x70
>> [c0000003f68bfe30] [c000000000009aa0] .ppc_clone+0x8/0xc
>> Instruction dump:
>> 4bff9281 2ba30010 7c7f1b78 40dd00f4 e96d0040 e93f0000 7ce95a14 e9070008
>> 7fa9582a 2fbd0000 41de0054 e81f0022 <7f3d002a> 38000000 886d01f2 980d01f2
>> ---[ end trace 366fe6c7ced3bfb0 ]---
>>
>> This did not happen yesterday. Just wondering if anyone can think of
>> anything obvious. Full console log at
>> http://ozlabs.org/~sfr/next-20120411.log.bz2
>
> I managed to bisect this down using pseries_defconfig with next-20120412
> to this patch:
>
> commit 85bbc003b24335e253a392f6a9874103b77abb36
> Author: Jiri Slaby <jslaby@suse.cz>
> Date: Mon Apr 2 13:54:22 2012 +0200
>
> TTY: HVC, use tty from tty_port
>
> The driver already used refcounting. So we just switch it to tty_port
> helpers. And switch to tty_port->lock for tty.
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> Reverting this commit (and 0146b6939074ebe14ece3604fd00e7be128a3812
> otherwise git barfs) fixes the problem on next-20120412.
>
> I'm assuming we got the ref count changes wrong somewhere in the patch
> but the tty code is beyond me. Jiri, can you take a look?
Yeah, I see. I forgot to remove a couple of tty reference drops. The
reference is dropped by tty_port_tty_set in open/close/hangup now. Does
the attached patch help?
thanks,
--
js
suse labs
[-- Attachment #2: 0001-HVC-fix-refcounting.patch --]
[-- Type: text/x-patch, Size: 1157 bytes --]
>From cc51efe721f5aa184e119c52c661a1faf865e492 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 13 Apr 2012 10:00:28 +0200
Subject: [PATCH 1/1] HVC: fix refcounting
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/hvc/hvc_console.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index 6c45cbf..260d4f2 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -338,7 +338,6 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
*/
if (rc) {
tty_port_tty_set(&hp->port, NULL);
- tty_kref_put(tty);
tty->driver_data = NULL;
tty_port_put(&hp->port);
printk(KERN_ERR "hvc_open: request_irq failed with rc %d.\n", rc);
@@ -393,7 +392,6 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
spin_unlock_irqrestore(&hp->port.lock, flags);
}
- tty_kref_put(tty);
tty_port_put(&hp->port);
}
@@ -433,7 +431,6 @@ static void hvc_hangup(struct tty_struct *tty)
while(temp_open_count) {
--temp_open_count;
- tty_kref_put(tty);
tty_port_put(&hp->port);
}
}
--
1.7.9.2
^ permalink raw reply related
* Re: linux-next: boot failures with next-20120411
From: Jiri Slaby @ 2012-04-13 8:04 UTC (permalink / raw)
To: Jiri Slaby
Cc: Michael Neuling, Stephen Rothwell, Greg Kroah-Hartman, LKML,
ppc-dev, linux-next
In-Reply-To: <4F87DD92.4090601@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 3795 bytes --]
On 04/13/2012 10:02 AM, Jiri Slaby wrote:
> On 04/13/2012 04:30 AM, Michael Neuling wrote:
>> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>>> Hi all,
>>>
>>> Some (not all) of my PowerPC boot tests have failed like this after
>>> getting into user mode (this one was just after udev started, but others
>>> are after other processes getting going):
>>>
>>> Unable to handle kernel paging request for data at address 0xc0000003f9d550
>>> Faulting instruction address: 0xc0000000001b7f40
>>> Oops: Kernel access of bad area, sig: 11 [#1]
>>> SMP NR_CPUS=32 NUMA pSeries
>>> Modules linked in: ehea
>>> NIP: c0000000001b7f40 LR: c0000000001b7f14 CTR: c0000000000e04f0
>>> REGS: c0000003f68bf6b0 TRAP: 0300 Not tainted (3.4.0-rc2-autokern1)
>>> MSR: 800000000280b032 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI> CR: 24422424 XER: 20000001
>>> SOFTE: 1
>>> CFAR: 000000000000562c
>>> DAR: 00c0000003f9d550, DSISR: 40000000
>>> TASK = c0000003f8818000[3192] 'kdump' THREAD: c0000003f68bc000 CPU: 5
>>> GPR00: 0000000000000000 c0000003f68bf930 c000000000ce1d40 c0000003fe00ec00
>>> GPR04: 00000000000002d0 0000000000000038 c0000003f8f935e8 c000000000e55280
>>> GPR08: 0000000000000011 c000000000bcb280 c000000000bcb1e8 000000000028a000
>>> GPR12: 0000000024422424 c00000000f33bc80 00000fffdd90a770 0000000000081000
>>> GPR16: c0000003f846c000 000000000de4f7a0 f00000000de4f7a0 0000000000000000
>>> GPR20: c0000003f8365408 c0000003f8365480 c0000003f8e5d110 0000000000000000
>>> GPR24: 0000000000000100 c0000003f8365400 c0000000001e5424 00000000000002d0
>>> GPR28: 0000000000000800 00c0000003f9d550 c000000000c5b718 c0000003fe00ec00
>>> NIP [c0000000001b7f40] .__kmalloc+0x70/0x230
>>> LR [c0000000001b7f14] .__kmalloc+0x44/0x230
>>> Call Trace:
>>> [c0000003f68bf930] [c0000003f68bf9b0] 0xc0000003f68bf9b0 (unreliable)
>>> [c0000003f68bf9e0] [c0000000001e5424] .alloc_fdmem+0x24/0x70
>>> [c0000003f68bfa60] [c0000000001e54f8] .alloc_fdtable+0x88/0x130
>>> [c0000003f68bfaf0] [c0000000001e5924] .dup_fd+0x384/0x450
>>> [c0000003f68bfbd0] [c00000000009a310] .copy_process+0x880/0x11d0
>>> [c0000003f68bfcd0] [c00000000009aee0] .do_fork+0x70/0x400
>>> [c0000003f68bfdc0] [c0000000000141c4] .sys_clone+0x54/0x70
>>> [c0000003f68bfe30] [c000000000009aa0] .ppc_clone+0x8/0xc
>>> Instruction dump:
>>> 4bff9281 2ba30010 7c7f1b78 40dd00f4 e96d0040 e93f0000 7ce95a14 e9070008
>>> 7fa9582a 2fbd0000 41de0054 e81f0022 <7f3d002a> 38000000 886d01f2 980d01f2
>>> ---[ end trace 366fe6c7ced3bfb0 ]---
>>>
>>> This did not happen yesterday. Just wondering if anyone can think of
>>> anything obvious. Full console log at
>>> http://ozlabs.org/~sfr/next-20120411.log.bz2
>>
>> I managed to bisect this down using pseries_defconfig with next-20120412
>> to this patch:
>>
>> commit 85bbc003b24335e253a392f6a9874103b77abb36
>> Author: Jiri Slaby <jslaby@suse.cz>
>> Date: Mon Apr 2 13:54:22 2012 +0200
>>
>> TTY: HVC, use tty from tty_port
>>
>> The driver already used refcounting. So we just switch it to tty_port
>> helpers. And switch to tty_port->lock for tty.
>>
>> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
>> Cc: linuxppc-dev@lists.ozlabs.org
>> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>
>> Reverting this commit (and 0146b6939074ebe14ece3604fd00e7be128a3812
>> otherwise git barfs) fixes the problem on next-20120412.
>>
>> I'm assuming we got the ref count changes wrong somewhere in the patch
>> but the tty code is beyond me. Jiri, can you take a look?
>
> Yeah, I see. I forgot to remove a couple of tty reference drops. The
> reference is dropped by tty_port_tty_set in open/close/hangup now. Does
> the attached patch help?
And the patch is incomplete. Now we have a leak. This one should work.
> thanks,
--
js
suse labs
[-- Attachment #2: 0001-HVC-fix-refcounting.patch --]
[-- Type: text/x-patch, Size: 1496 bytes --]
>From 7a55e2976cb5a47e499a6db335ad30ecac2e621c Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 13 Apr 2012 10:00:28 +0200
Subject: [PATCH 1/1] HVC: fix refcounting
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
drivers/tty/hvc/hvc_console.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
index 6c45cbf..2d691eb 100644
--- a/drivers/tty/hvc/hvc_console.c
+++ b/drivers/tty/hvc/hvc_console.c
@@ -317,8 +317,6 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
/* Check and then increment for fast path open. */
if (hp->port.count++ > 0) {
spin_unlock_irqrestore(&hp->port.lock, flags);
- /* FIXME why taking a reference here? */
- tty_kref_get(tty);
hvc_kick();
return 0;
} /* else count == 0 */
@@ -338,7 +336,6 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
*/
if (rc) {
tty_port_tty_set(&hp->port, NULL);
- tty_kref_put(tty);
tty->driver_data = NULL;
tty_port_put(&hp->port);
printk(KERN_ERR "hvc_open: request_irq failed with rc %d.\n", rc);
@@ -393,7 +390,6 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
spin_unlock_irqrestore(&hp->port.lock, flags);
}
- tty_kref_put(tty);
tty_port_put(&hp->port);
}
@@ -433,7 +429,6 @@ static void hvc_hangup(struct tty_struct *tty)
while(temp_open_count) {
--temp_open_count;
- tty_kref_put(tty);
tty_port_put(&hp->port);
}
}
--
1.7.9.2
^ permalink raw reply related
* Re: linux-next: boot failures with next-20120411
From: Michael Neuling @ 2012-04-13 8:09 UTC (permalink / raw)
To: Jiri Slaby
Cc: Jiri Slaby, Stephen Rothwell, Greg Kroah-Hartman, LKML, ppc-dev,
linux-next
In-Reply-To: <4F87DE23.9010907@suse.cz>
Jiri Slaby <jslaby@suse.cz> wrote:
> On 04/13/2012 10:02 AM, Jiri Slaby wrote:
> > On 04/13/2012 04:30 AM, Michael Neuling wrote:
> >> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >>
> >>> Hi all,
> >>>
> >>> Some (not all) of my PowerPC boot tests have failed like this after
> >>> getting into user mode (this one was just after udev started, but others
> >>> are after other processes getting going):
> >>>
> >>> Unable to handle kernel paging request for data at address 0xc0000003f9d550
> >>> Faulting instruction address: 0xc0000000001b7f40
> >>> Oops: Kernel access of bad area, sig: 11 [#1]
> >>> SMP NR_CPUS=32 NUMA pSeries
> >>> Modules linked in: ehea
> >>> NIP: c0000000001b7f40 LR: c0000000001b7f14 CTR: c0000000000e04f0
> >>> REGS: c0000003f68bf6b0 TRAP: 0300 Not tainted (3.4.0-rc2-autokern1)
> >>> MSR: 800000000280b032 <SF,VEC,VSX,EE,FP,ME,IR,DR,RI> CR: 24422424 XER: 20000001
> >>> SOFTE: 1
> >>> CFAR: 000000000000562c
> >>> DAR: 00c0000003f9d550, DSISR: 40000000
> >>> TASK = c0000003f8818000[3192] 'kdump' THREAD: c0000003f68bc000 CPU: 5
> >>> GPR00: 0000000000000000 c0000003f68bf930 c000000000ce1d40 c0000003fe00ec00
> >>> GPR04: 00000000000002d0 0000000000000038 c0000003f8f935e8 c000000000e55280
> >>> GPR08: 0000000000000011 c000000000bcb280 c000000000bcb1e8 000000000028a000
> >>> GPR12: 0000000024422424 c00000000f33bc80 00000fffdd90a770 0000000000081000
> >>> GPR16: c0000003f846c000 000000000de4f7a0 f00000000de4f7a0 0000000000000000
> >>> GPR20: c0000003f8365408 c0000003f8365480 c0000003f8e5d110 0000000000000000
> >>> GPR24: 0000000000000100 c0000003f8365400 c0000000001e5424 00000000000002d0
> >>> GPR28: 0000000000000800 00c0000003f9d550 c000000000c5b718 c0000003fe00ec00
> >>> NIP [c0000000001b7f40] .__kmalloc+0x70/0x230
> >>> LR [c0000000001b7f14] .__kmalloc+0x44/0x230
> >>> Call Trace:
> >>> [c0000003f68bf930] [c0000003f68bf9b0] 0xc0000003f68bf9b0 (unreliable)
> >>> [c0000003f68bf9e0] [c0000000001e5424] .alloc_fdmem+0x24/0x70
> >>> [c0000003f68bfa60] [c0000000001e54f8] .alloc_fdtable+0x88/0x130
> >>> [c0000003f68bfaf0] [c0000000001e5924] .dup_fd+0x384/0x450
> >>> [c0000003f68bfbd0] [c00000000009a310] .copy_process+0x880/0x11d0
> >>> [c0000003f68bfcd0] [c00000000009aee0] .do_fork+0x70/0x400
> >>> [c0000003f68bfdc0] [c0000000000141c4] .sys_clone+0x54/0x70
> >>> [c0000003f68bfe30] [c000000000009aa0] .ppc_clone+0x8/0xc
> >>> Instruction dump:
> >>> 4bff9281 2ba30010 7c7f1b78 40dd00f4 e96d0040 e93f0000 7ce95a14 e9070008
> >>> 7fa9582a 2fbd0000 41de0054 e81f0022 <7f3d002a> 38000000 886d01f2 980d01f2
> >>> ---[ end trace 366fe6c7ced3bfb0 ]---
> >>>
> >>> This did not happen yesterday. Just wondering if anyone can think of
> >>> anything obvious. Full console log at
> >>> http://ozlabs.org/~sfr/next-20120411.log.bz2
> >>
> >> I managed to bisect this down using pseries_defconfig with next-20120412
> >> to this patch:
> >>
> >> commit 85bbc003b24335e253a392f6a9874103b77abb36
> >> Author: Jiri Slaby <jslaby@suse.cz>
> >> Date: Mon Apr 2 13:54:22 2012 +0200
> >>
> >> TTY: HVC, use tty from tty_port
> >>
> >> The driver already used refcounting. So we just switch it to tty_port
> >> helpers. And switch to tty_port->lock for tty.
> >>
> >> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> >> Cc: linuxppc-dev@lists.ozlabs.org
> >> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >>
> >> Reverting this commit (and 0146b6939074ebe14ece3604fd00e7be128a3812
> >> otherwise git barfs) fixes the problem on next-20120412.
> >>
> >> I'm assuming we got the ref count changes wrong somewhere in the patch
> >> but the tty code is beyond me. Jiri, can you take a look?
> >
> > Yeah, I see. I forgot to remove a couple of tty reference drops. The
> > reference is dropped by tty_port_tty_set in open/close/hangup now. Does
> > the attached patch help?
>
> And the patch is incomplete. Now we have a leak. This one should work.
Fixes the problem here.. Thanks.
Tested-by: Michael Neuling <mikey@neuling.org>
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Mark Brown @ 2012-04-13 8:37 UTC (permalink / raw)
To: Paul Gortmaker
Cc: linus.walleij, linux-next, shawn.guo, rmk+kernel,
linux-arm-kernel
In-Reply-To: <20120413012230.GA30438@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
On Thu, Apr 12, 2012 at 09:22:31PM -0400, Paul Gortmaker wrote:
> is pointed at by git bisect for the u8500_defconfig build failure:
> If, like my earlier mail this week, this is something you've already
> fixed, then please provide me a link, and I'll gladly include that in
> the triage report, so you don't get needless extra mails about it.
Not me, but Linus W has a patch. No idea about a link off the top of my
head, google should turn something up I guess. It's exactly the same
sort of implicit header dependency issue that your cleanups keep
triggering.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the drm tree with Linus' tree
From: Daniel Vetter @ 2012-04-13 8:59 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Dave Airlie, linux-next, linux-kernel, Daniel Vetter,
Daniel Kurtz
In-Reply-To: <20120413133817.f8bbf0f6d95ada9f86b93800@canb.auug.org.au>
On Fri, Apr 13, 2012 at 01:38:17PM +1000, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_i2c.c between commit 6a562e3daee2 ("Revert
> "drm/i915: reenable gmbus on gen3+ again"") from Linus' tree and commits
> 0fb3f969c868 ("drm/i915: enable gmbus on gen2") and 2ed06c93a1fc
> ("drm/i915/intel_i2c: gmbus disabled and reserved ports are invalid")
> from the drm tree.
>
> I just used the drm tree version.
That's correct, gmbus is too broken for 3.4, but we already have quite a
few fixes for known issues queued for 3.5, so leaving it enabled there is
the right thing for -next. I plan to do a backmerge as soon as -rc3 is out
there, I have a few more patches for drm-intel-next that depend/conflict
with new patches merged to Linus' tree.
Thanks, Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Russell King - ARM Linux @ 2012-04-13 10:32 UTC (permalink / raw)
To: Shawn Guo
Cc: Paul Gortmaker, broonie, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <CAAQ0ZWReL=+bm9UOnt2=Dfy0zeWbJe3=y3pPzUKRzm2y277kFQ@mail.gmail.com>
On Fri, Apr 13, 2012 at 10:01:52AM +0800, Shawn Guo wrote:
> On 13 April 2012 09:22, Paul Gortmaker <paul.gortmaker@windriver.com> wrote:
> > Hi Mark,
> >
> > The commit in linux-next:
> >
> > -----------------
> > commit b2bc9e0ee349db84035d8141e85babc7986594d7
> > Author: Mark Brown <broonie@sirena.org.uk>
> > Date: Mon Apr 2 12:30:35 2012 +0100
> >
> > ARM: 7366/1: amba: Remove AMBA level regulator support
> > -----------------
> >
> > is pointed at by git bisect for the u8500_defconfig build failure:
> >
> > drivers/dma/ste_dma40.c:2708:3: error: implicit declaration of function
> > 'regulator_disable' [-Werror=implicit-function-declaration]
> > drivers/dma/ste_dma40.c:2747:3: error: implicit declaration of function
> > 'regulator_enable' [-Werror=implicit-function-declaration]
> > drivers/dma/ste_dma40.c:3260:3: error: implicit declaration of function
> > 'regulator_get' [-Werror=implicit-function-declaration]
> > drivers/dma/ste_dma40.c:3271:4: error: implicit declaration of function
> > 'regulator_put' [-Werror=implicit-function-declaration]
> >
> That's because Mark's patch removes "#include
> <linux/regulator/consumer.h>" included indirectly by
> drivers/dma/ste_dma40.c from linux/amba/bus.h. The ste_dma40.c should
> really directly includes consumer.h.
Okay, I'll drop this patch because it's causing regressions, so it can't
be pushed as a 'fix' during -rc.
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Mark Brown @ 2012-04-13 10:44 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Shawn Guo, Paul Gortmaker, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <20120413103207.GL24211@n2100.arm.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 973 bytes --]
On Fri, Apr 13, 2012 at 11:32:07AM +0100, Russell King - ARM Linux wrote:
> On Fri, Apr 13, 2012 at 10:01:52AM +0800, Shawn Guo wrote:
> > That's because Mark's patch removes "#include
> > <linux/regulator/consumer.h>" included indirectly by
> > drivers/dma/ste_dma40.c from linux/amba/bus.h. The ste_dma40.c should
> > really directly includes consumer.h.
> Okay, I'll drop this patch because it's causing regressions, so it can't
> be pushed as a 'fix' during -rc.
I did say we should've been pushing Shawn's patch in as a minimal fix
for 3.4... Alternatively if you're happy with the code just keeping the
header in place should avoid any issues, the one regression was just an
implicit header dependency.
Regardless of what happens for 3.4 we should keep the removal for -next,
it's clear that we don't want the bus doing this and it's causing
breakage for the non-ST platforms. Do I need to resend the patch to the
patch system or will the existing copy be OK?
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Russell King - ARM Linux @ 2012-04-13 10:49 UTC (permalink / raw)
To: Mark Brown
Cc: Shawn Guo, Paul Gortmaker, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <20120413104452.GR3168@opensource.wolfsonmicro.com>
On Fri, Apr 13, 2012 at 11:44:52AM +0100, Mark Brown wrote:
> On Fri, Apr 13, 2012 at 11:32:07AM +0100, Russell King - ARM Linux wrote:
> > On Fri, Apr 13, 2012 at 10:01:52AM +0800, Shawn Guo wrote:
>
> > > That's because Mark's patch removes "#include
> > > <linux/regulator/consumer.h>" included indirectly by
> > > drivers/dma/ste_dma40.c from linux/amba/bus.h. The ste_dma40.c should
> > > really directly includes consumer.h.
>
> > Okay, I'll drop this patch because it's causing regressions, so it can't
> > be pushed as a 'fix' during -rc.
>
> I did say we should've been pushing Shawn's patch in as a minimal fix
> for 3.4...
What patch?
> Alternatively if you're happy with the code just keeping the
> header in place should avoid any issues, the one regression was just an
> implicit header dependency.
>
> Regardless of what happens for 3.4 we should keep the removal for -next,
> it's clear that we don't want the bus doing this and it's causing
> breakage for the non-ST platforms. Do I need to resend the patch to the
> patch system or will the existing copy be OK?
What I want is something that doesn't cause a regression for 3.4.
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Mark Brown @ 2012-04-13 11:25 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Shawn Guo, Paul Gortmaker, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <20120413104900.GM24211@n2100.arm.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 791 bytes --]
On Fri, Apr 13, 2012 at 11:49:00AM +0100, Russell King - ARM Linux wrote:
> On Fri, Apr 13, 2012 at 11:44:52AM +0100, Mark Brown wrote:
> > I did say we should've been pushing Shawn's patch in as a minimal fix
> > for 3.4...
> What patch?
The original one which just changed the return code that's checked for.
> > Regardless of what happens for 3.4 we should keep the removal for -next,
> > it's clear that we don't want the bus doing this and it's causing
> > breakage for the non-ST platforms. Do I need to resend the patch to the
> > patch system or will the existing copy be OK?
> What I want is something that doesn't cause a regression for 3.4.
Well, if the overall result is something other than removing the code in
3.5 then we'll just get further regressions down the line.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Mark Brown @ 2012-04-13 12:07 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Shawn Guo, Paul Gortmaker, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <20120413104900.GM24211@n2100.arm.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 302 bytes --]
On Fri, Apr 13, 2012 at 11:49:00AM +0100, Russell King - ARM Linux wrote:
> What I want is something that doesn't cause a regression for 3.4.
Oh, and note that there's already a fix for the missing header although
with all the git trees I've no idea what the process is for getting it
into mainline.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* Re: linux-next: Tree for Apr 12
From: Alan Cox @ 2012-04-13 12:11 UTC (permalink / raw)
To: Andrew Morton; +Cc: Stephen Rothwell, linux-next, LKML, netdev
In-Reply-To: <20120412142415.564710b8.akpm@linux-foundation.org>
On Thu, 12 Apr 2012 14:24:15 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:
> On Thu, 12 Apr 2012 14:59:31 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > I have created today's linux-next tree at
> > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
>
> This isn't working for me. Some time between April 3 and April 12
> someone merged something into the non-mm part of linux-next which broke
> ssh.
You are getting further than me - on 32bit -next of the 12th explodes
with random userspace crashes in init or similar early code.
Alan
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Fabio Estevam @ 2012-04-13 12:17 UTC (permalink / raw)
To: Mark Brown
Cc: Russell King - ARM Linux, Paul Gortmaker, linus.walleij,
Shawn Guo, linux-next, linux-arm-kernel
In-Reply-To: <20120413112539.GS3168@opensource.wolfsonmicro.com>
On Fri, Apr 13, 2012 at 8:25 AM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
>> > I did say we should've been pushing Shawn's patch in as a minimal fix
>> > for 3.4...
>
>> What patch?
>
> The original one which just changed the return code that's checked for.
I guess you are referring to this one:
http://www.spinics.net/lists/arm-kernel/msg167196.html
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Russell King - ARM Linux @ 2012-04-13 12:19 UTC (permalink / raw)
To: Mark Brown
Cc: Shawn Guo, Paul Gortmaker, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <20120413120706.GT3168@opensource.wolfsonmicro.com>
On Fri, Apr 13, 2012 at 01:07:07PM +0100, Mark Brown wrote:
> On Fri, Apr 13, 2012 at 11:49:00AM +0100, Russell King - ARM Linux wrote:
>
> > What I want is something that doesn't cause a regression for 3.4.
>
> Oh, and note that there's already a fix for the missing header although
> with all the git trees I've no idea what the process is for getting it
> into mainline.
That really doesn't make any difference about whether I can push 7366/1
as is or not. If the fix for the missing header is going through some
other git tree, I can't push 7366/1 until that fix has gone in - and
I'm not going to be tracking when that happens.
TBH, its something that _you_ need to manage - you created this regression
in the first place by changing the regulator API without first reviewing
all the callsites. Grep is a wonderful tool for finding those. So I'll
leave it entirely up to you to figure out how to fix the AMBA regression
you caused in a sane way in -rc - and without causing any additional
regressions by doing so.
If you want me to apply 7367/1 instead, then please say so directly. If
you want 7366/1 plus the header file fixed, then that needs to be figured
out.
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Linus Walleij @ 2012-04-13 12:26 UTC (permalink / raw)
To: Paul Gortmaker
Cc: broonie, linux-next, shawn.guo, rmk+kernel, linux-arm-kernel
In-Reply-To: <20120413012230.GA30438@windriver.com>
On Fri, Apr 13, 2012 at 3:22 AM, Paul Gortmaker
<paul.gortmaker@windriver.com> wrote:
> is pointed at by git bisect for the u8500_defconfig build failure:
>
> drivers/dma/ste_dma40.c:2708:3: error: implicit declaration of function
> 'regulator_disable' [-Werror=implicit-function-declaration]
> drivers/dma/ste_dma40.c:2747:3: error: implicit declaration of function
> 'regulator_enable' [-Werror=implicit-function-declaration]
> drivers/dma/ste_dma40.c:3260:3: error: implicit declaration of function
> 'regulator_get' [-Werror=implicit-function-declaration]
> drivers/dma/ste_dma40.c:3271:4: error: implicit declaration of function
> 'regulator_put' [-Werror=implicit-function-declaration]
I've already sent a patch to the DMA maintainer to fix this.
It was a bug in the DMA driver actually - it did not include the proper
headers - so it just got triggered by this patch.
http://marc.info/?l=linux-kernel&m=133424730706377&w=2
Yours,
Linus Walleij
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Linus Walleij @ 2012-04-13 12:30 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Shawn Guo, Paul Gortmaker, broonie, linux-next, linux-arm-kernel,
Vinod Koul
In-Reply-To: <20120413103207.GL24211@n2100.arm.linux.org.uk>
On Fri, Apr 13, 2012 at 12:32 PM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> On Fri, Apr 13, 2012 at 10:01:52AM +0800, Shawn Guo wrote:
>> That's because Mark's patch removes "#include
>> <linux/regulator/consumer.h>" included indirectly by
>> drivers/dma/ste_dma40.c from linux/amba/bus.h. The ste_dma40.c should
>> really directly includes consumer.h.
>
> Okay, I'll drop this patch because it's causing regressions, so it can't
> be pushed as a 'fix' during -rc.
Actually *not* having Marks patch also causes a regression on Ux500,
albeit not at compile time, but at runtime.
So for me as ux500 maintainer it's perfectly OK to have compilation
broken until that DMA patch arrives (should just be an issue of the
DMA maintainer picking it up), but if others feel differently
by all means hold it off until the other one arrives.
Yours,
Linus Walleij
^ permalink raw reply
* Re: linux-next: manual merge of the arm-soc tree with the mmc tree
From: Nicolas Ferre @ 2012-04-13 12:46 UTC (permalink / raw)
To: Chris Ball, Olof Johansson, Arnd Bergmann
Cc: Stephen Rothwell, linux-arm-kernel, linux-next, linux-kernel,
Sascha Hauer
In-Reply-To: <87pqbdr1md.fsf@laptop.org>
On 04/12/2012 06:54 AM, Chris Ball :
> Hi,
>
> On Thu, Apr 12 2012, Stephen Rothwell wrote:
>> Today's linux-next merge of the arm-soc tree got a conflict in
>> drivers/mmc/host/Kconfig between commit a334b9550294 ("mmc: remove imxmmc
>> driver") from the mmc tree and commits a21a92c0c787 ("mmc: Kconfig: remove
>> choice between at91_mci and atmel-mci") and 62080f06de6b ("mmc:
>> atmel-mci: remove the need for CONFIG_MMC_ATMELMCI_DMA") from the arm-soc
>> tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary.
>
> Thanks, Stephen.
>
> Nicolas and Arnd, these MMC Kconfig patches weren't sent to me or
> linux-mmc@ for review, so I haven't seen them before. They look
> fine, but I'd like to be in the loop directly to avoid surprises.
Yes Chris, my fault here, it is true that I should have send those
patches to you and linux-mmc.
> Do these MMC patches have any dependency on other work? It doesn't
> look like it. If that's so, I'd rather carry them in the MMC tree
> to save Stephen and Linus from dealing with the merge conflict.
Indeed, and in the meantime, it seems that these Kconfig modifications
are not as harmless as the others in the series.
I propose to redo a pull request without those two patches. We will
resend them directly through the MMC subsystem together with other
mmc-related fixes. Moreover, all this will probably make more sense as
3.5 modifications...
Best regards,
--
Nicolas Ferre
^ permalink raw reply
* Re: linux-next: "amba: Remove AMBA level regulator support" commit.
From: Mark Brown @ 2012-04-13 14:04 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: Shawn Guo, Paul Gortmaker, linus.walleij, linux-next,
linux-arm-kernel
In-Reply-To: <20120413121914.GN24211@n2100.arm.linux.org.uk>
[-- Attachment #1: Type: text/plain, Size: 3209 bytes --]
On Fri, Apr 13, 2012 at 01:19:14PM +0100, Russell King - ARM Linux wrote:
> That really doesn't make any difference about whether I can push 7366/1
> as is or not. If the fix for the missing header is going through some
> other git tree, I can't push 7366/1 until that fix has gone in - and
> I'm not going to be tracking when that happens.
I've got quite limited visibility on how this stuff gets handled; the
patch tracking system always feels like a bit of a black hole to me as
I'm never sure when to send things to it or when they might get applied
and the usual mechanisms for indicating how things get applied (tags in
the header and comments after the ---) aren't available.
I have to say was rather surprised when I realised you had applied my
change for -rc rather than for -next.
> TBH, its something that _you_ need to manage - you created this regression
> in the first place by changing the regulator API without first reviewing
> all the callsites. Grep is a wonderful tool for finding those. So I'll
You know as well as I do that a grep of all the users isn't going to
turn up everything reliably, this is one of the reasons why people
should be testing -next (which apparently nobody had been doing on any
of the affected platforms).
Looking at the code I suspect that my initial read was that if anything
hit that case we'd crash as vcore is left with an error pointer, though
unusually for such code the IS_ERR() is actually used at every call
site so it actually managed to work. Plus the fact that the code was
never supposed to work in the first place, of course.
> leave it entirely up to you to figure out how to fix the AMBA regression
> you caused in a sane way in -rc - and without causing any additional
> regressions by doing so.
> If you want me to apply 7367/1 instead, then please say so directly. If
> you want 7366/1 plus the header file fixed, then that needs to be figured
> out.
Right from my initial reply to it I've said that 7367/1 was a good,
minimal fix for 3.4 but that for 3.5 we should be doing 7366/1 or
thereabouts. Like I say I was quite surprised when you applied the
larger fix for 3.4, though there are good arguments in favour of doing
that in that it removes an API which nobody should be using. So long as
what we end up with in 3.5 is 7366/x (which I think everyone agrees is
the goal) I'm not too fussed about which solution is adopted for 3.4.
There's two ways to go about this:
- Apply 7366/3 (which keeps regulator/consumer.h in linux/amba.h but is
otherwise the same as 7366/1) and then either leave things or clean
up the header in 3.5.
- Apply 7367/1 for 3.4 and then rebase 7366/x after it and put that in
-next for inclusion in 3.5.
Which one is chosen is a matter of taste for you. I'd initially
expected the second approach but as it seems you're comfortable with the
larger patch we may as well go with it, the header file should be the
only dependency.
For the benefit of people reading the mails 7366/x is the change to
remove the regulator usage from AMBA (amba: Remove AMBA level regulator
support) and 7367/x is the change to just change the return code (amba:
adapt to regulator probe deferral change).
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
* linux-next: "spi/devicetree: Move devicetree support code into spi directory" commit
From: Paul Gortmaker @ 2012-04-13 14:56 UTC (permalink / raw)
To: grant.likely; +Cc: rob.herring, linux-next
Hi Grant,
Can you take a look at this failure?
drivers/spi/spi-fsl-lib.h:56:33: warning: 'struct spi_message' declared inside parameter list
drivers/spi/spi-fsl-lib.h:56:33: warning: its scope is only this definition or declaration, which is probably not what you want
drivers/spi/spi-fsl-lib.h:115:64: warning: 'struct spi_message' declared inside parameter list
drivers/spi/spi-fsl-lib.c: In function 'mpc8xxx_spi_work':
drivers/spi/spi-fsl-lib.c:68:27: error: dereferencing pointer to incomplete type
Bisect leads me to:
------------
6810d770847c0f24555c13dd80b64fcc30c47ad8 is the first bad commit
commit 6810d770847c0f24555c13dd80b64fcc30c47ad8
Author: Grant Likely <grant.likely@secretlab.ca>
Date: Sat Apr 7 14:16:53 2012 -0600
spi/devicetree: Move devicetree support code into spi directory
------------
Failure is in mpc85xx_defconfig.
http://kisskb.ellerman.id.au/kisskb/buildresult/6100610/
Thanks,
Paul.
^ 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