From: Sedat Dilek <sedat.dilek@googlemail.com>
To: LKML <linux-kernel@vger.kernel.org>, linux-ext4@vger.kernel.org
Cc: "Theodore Ts'o" <tytso@mit.edu>,
sfr@canb.auug.org.au, Arnd Bergmann <arnd@arndb.de>
Subject: Re: [next-20101028] Call trace in ext4
Date: Thu, 28 Oct 2010 17:08:32 +0200 [thread overview]
Message-ID: <AANLkTinOoxB4FnVXm1sSbW7zbdrEpA_dYzphh0CEWr-8@mail.gmail.com> (raw)
In-Reply-To: <AANLkTin+GsrEFb2+tYD4ctg3o9t3wzpcywOkF9S1n6=0@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 7753 bytes --]
I tried to GIT-pull ext4/upstream-merge and linux-2.6/master into
linux-next (20101028), for both cases there occured CONFLICTS.
So let's see if this is fixed in tommorow's linux-next patch .
For now, I switch to Linux 2.6.36-git11 and will report later.
- Sedat -
Attached files:
MERGE_CONFLICT_ext4-upstream-merge and MERGE_CONFLICT_linux-2.6
On Thu, Oct 28, 2010 at 12:34 PM, Sedat Dilek
<sedat.dilek@googlemail.com> wrote:
> [ Changes subject s/next-20101038/next-20101028 ]
>
> Not sure if there got something wrong when merging ext4 [1] into
> linux-next (before GIT-pull-request to LKML) or some patches missing
> from Ted's ext4/upstream-merge GIT branch?
>
> - Sedat -
>
> P.S.: Forgotten to add v2 of 2nd patch I mentionned below, sorry.
>
> [1] http://lkml.org/lkml/2010/10/27/480
> [2] http://git.kernel.org/?p=linux/kernel/git/tytso/ext4.git;a=shortlog;h=refs/heads/upstream-merge
>
> On Thu, Oct 28, 2010 at 12:05 PM, Sedat Dilek
> <sedat.dilek@googlemail.com> wrote:
>> Hi,
>>
>> I have built today linux-next as of next-20101028 in a non-BKL config
>> (kernel-config attached) on a Debian i386/sid host.
>>
>> When I start my quassel IRC-client I get reproducibly this call-trace:
>>
>> # tail -40 kern.log
>> Oct 28 11:42:54 tbox kernel: [ 32.872957] EXT3-fs (sdb5): warning:
>> maximal mount count reached, running e2fsck is recommended
>> Oct 28 11:42:54 tbox kernel: [ 32.873621] EXT3-fs (sdb5): using
>> internal journal
>> Oct 28 11:42:54 tbox kernel: [ 32.873635] EXT3-fs (sdb5): mounted
>> filesystem with ordered data mode
>> Oct 28 11:44:16 tbox kernel: [ 115.480401] ------------[ cut here ]------------
>> Oct 28 11:44:16 tbox kernel: [ 115.480598] kernel BUG at
>> /home/sd/src/linux-2.6/linux-2.6.36/debian/build/source_i386_none/fs/ext4/inode.c:2721!
>> Oct 28 11:44:16 tbox kernel: [ 115.480979] invalid opcode: 0000 [#1] SMP
>> Oct 28 11:44:16 tbox kernel: [ 115.481155] last sysfs file:
>> /sys/devices/LNXSYSTM:00/device:00/PNP0A03:00/device:01/PNP0C09:00/PNP0C0A:00/power_supply/BAT0/energy_full
>> Oct 28 11:44:16 tbox kernel: [ 115.481610] Modules linked in: ext3
>> jbd sco aes_i586 rfcomm bnep aes_generic l2cap bluetooth acpi_cpufreq
>> mperf cpufreq_powersave cpufreq_userspace cpufreq_stats ppdev
>> cpufreq_conservative lp dm_crypt binfmt_misc arc4 snd_intel8x0 ecb
>> snd_intel8x0m radeon thinkpad_acpi snd_ac97_codec ath5k snd_seq_midi
>> ac97_bus pcmcia snd_pcm_oss joydev snd_rawmidi snd_seq_midi_event ath
>> mac80211 snd_mixer_oss ttm cfg80211 snd_seq snd_pcm yenta_socket
>> pcmcia_rsrc drm_kms_helper drm snd_seq_device snd_timer pcmcia_core
>> i2c_algo_bit nsc_ircc rfkill snd_page_alloc irda i2c_i801 shpchp snd
>> i2c_core tpm_tis rng_core pci_hotplug psmouse processor tpm soundcore
>> parport_pc video ac tpm_bios battery button led_class pcspkr evdev
>> parport power_supply serio_raw nvram output crc_ccitt fuse autofs4
>> ext4 mbcache jbd2 crc16 dm_mod usbhid hid usb_storage sg sd_mod sr_mod
>> crc_t10dif cdrom ata_generic ata_piix libata uhci_hcd ehci_hcd usbcore
>> scsi_mod thermal e1000 thermal_sys floppy nls_base [last unloaded:
>> scsi
>> Oct 28 11:44:16 tbox kernel: _wait_scan]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] Pid: 237, comm:
>> jbd2/sda5-8 Not tainted 2.6.36-next-20101028.1-686 #1 2374SG6/2374SG6
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] EIP: 0060:[<f86282fb>]
>> EFLAGS: 00010246 CPU: 0
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] EIP is at
>> ext4_writepage+0x8d/0x1f1 [ext4]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] EAX: 40020029 EBX:
>> f76934a0 ECX: 05050030 EDX: 00000000
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] ESI: 00005050 EDI:
>> 00001000 EBP: f5f3c548 ESP: ef973dbc
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] DS: 007b ES: 007b FS:
>> 00d8 GS: 00e0 SS: 0068
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] Process jbd2/sda5-8 (pid:
>> 237, ti=ef972000 task=ef8c9080 task.ti=ef972000)
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] Stack:
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] 00000005 00000000
>> ef973e98 00000000 f5f3c600 ef973e98 00000000 00005050
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] c108fe6e f76934a0
>> c1090ea4 00000001 f5f3c600 00000004 00000002 00000000
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] 00000006 0000000e
>> ef9a6180 c108fe66 e74172ff 0000000e 00000000 f7693400
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] Call Trace:
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c108fe6e>] ? __writepage+0x8/0x1f
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1090ea4>] ?
>> write_cache_pages+0x1cc/0x281
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c108fe66>] ? __writepage+0x0/0x1f
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1090f6f>] ?
>> generic_writepages+0x16/0x1d
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<f85ab8d9>] ?
>> journal_submit_data_buffers+0xf5/0x150 [jbd2]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<f85abd1e>] ?
>> jbd2_journal_commit_transaction+0x2d1/0xda3 [jbd2]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1025bdb>] ?
>> dequeue_task_fair+0x1b/0x57
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c10392df>] ?
>> lock_timer_base+0x19/0x34
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1039356>] ?
>> try_to_del_timer_sync+0x5c/0x63
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<f85afdf2>] ?
>> kjournald2+0x9e/0x1c7 [jbd2]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1043ffe>] ?
>> autoremove_wake_function+0x0/0x29
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<f85afd54>] ?
>> kjournald2+0x0/0x1c7 [jbd2]
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1043cb2>] ? kthread+0x63/0x68
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c1043c4f>] ? kthread+0x0/0x68
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] [<c10034fe>] ?
>> kernel_thread_helper+0x6/0x10
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] Code: 0c 89 34 24 89 ce 0f
>> ac d6 0c 39 7c 24 04 75 05 39 34 24 74 07 bf 00 10 00 00 eb 08 89 cf
>> 81 e7 ff 0f 00 00 8b 03 f6 c4 08 75 04 <0f> 0b eb fe c7 04 24 00 00 00
>> 00 83 7b 0c 00 75 37 68 46 ac 62
>> Oct 28 11:44:16 tbox kernel: [ 115.484020] EIP: [<f86282fb>]
>> ext4_writepage+0x8d/0x1f1 [ext4] SS:ESP 0068:ef973dbc
>> Oct 28 11:44:16 tbox kernel: [ 115.564589] ---[ end trace 1b8c420fb1d1ae45 ]---
>>
>> The code section looks like:
>> [ fs/ext4/inode.c ]
>> ...
>> /*
>> * If the page does not have buffers (for whatever reason),
>> * try to create them using __block_write_begin. If this
>> * fails, redirty the page and move on.
>> */
>> if (!page_buffers(page)) { <--- LINE #2721
>> if (__block_write_begin(page, 0, len,
>> noalloc_get_block_write)) {
>> redirty_page:
>> redirty_page_for_writepage(wbc, page);
>> unlock_page(page);
>> return 0;
>> }
>> commit_write = 1;
>> }
>> ...
>>
>> I am not sure if this is a general ext4 problem or only in a non-BKL setup.
>>
>> Hope this helps to track down the problem.
>>
>> Kind Regards,
>> - Sedat -
>>
>> P.S.:
>> I also have tried with patches from [1] and [2], v2 versions attached
>> to make linux-next happy.
>>
>> [1] http://lkml.org/lkml/2010/10/28/36
>> [2] http://lkml.org/lkml/2010/10/28/40
>>
>
[-- Attachment #2: MERGE_CONFLICT_ext4-upstream-merge --]
[-- Type: application/octet-stream, Size: 21345 bytes --]
sd@tbox:/mnt/sdb5/linux-next/linux-next$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git upstream-merge:ext4-upstream-merge
remote: Counting objects: 3595, done.
remote: Compressing objects: 100% (399/399), done.
remote: Total 2114 (delta 1696), reused 2063 (delta 1652)
Receiving objects: 100% (2114/2114), 533.19 KiB | 136 KiB/s, done.
Resolving deltas: 100% (1696/1696), completed with 450 local objects.
From git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* [new branch] upstream-merge -> ext4-upstream-merge
* [new tag] 2.6.24-git6 -> 2.6.24-git6
* [new tag] ext3-latency-fixes_base -> ext3-latency-fixes_base
* [new tag] ext3-latency-fixes_bottom -> ext3-latency-fixes_bottom
* [new tag] ext3-latency-fixes_top -> ext3-latency-fixes_top
* [new tag] ext4dev_base -> ext4dev_base
* [new tag] ext4dev_bottom -> ext4dev_bottom
* [new tag] master_base -> master_base
* [new tag] master_bottom -> master_bottom
* [new tag] v2.6.22-git13 -> v2.6.22-git13
* [new tag] v2.6.24-git12 -> v2.6.24-git12
* [new tag] v2.6.24-git14 -> v2.6.24-git14
* [new tag] v2.6.24-git20 -> v2.6.24-git20
* [new tag] v2.6.24-git21 -> v2.6.24-git21
* [new tag] v2.6.24-git6 -> v2.6.24-git6
* [new tag] v2.6.25-git1 -> v2.6.25-git1
* [new tag] v2.6.25-git10 -> v2.6.25-git10
* [new tag] v2.6.25-git11 -> v2.6.25-git11
* [new tag] v2.6.25-git12 -> v2.6.25-git12
* [new tag] v2.6.25-git13 -> v2.6.25-git13
* [new tag] v2.6.25-git14 -> v2.6.25-git14
* [new tag] v2.6.25-git15 -> v2.6.25-git15
* [new tag] v2.6.25-git16 -> v2.6.25-git16
* [new tag] v2.6.25-git17 -> v2.6.25-git17
* [new tag] v2.6.25-git18 -> v2.6.25-git18
* [new tag] v2.6.25-git19 -> v2.6.25-git19
* [new tag] v2.6.25-git2 -> v2.6.25-git2
* [new tag] v2.6.25-git20 -> v2.6.25-git20
* [new tag] v2.6.25-git3 -> v2.6.25-git3
* [new tag] v2.6.25-git4 -> v2.6.25-git4
* [new tag] v2.6.25-git5 -> v2.6.25-git5
* [new tag] v2.6.25-git6 -> v2.6.25-git6
* [new tag] v2.6.25-git7 -> v2.6.25-git7
* [new tag] v2.6.25-git8 -> v2.6.25-git8
* [new tag] v2.6.25-git9 -> v2.6.25-git9
* [new tag] v2.6.25-rc3-git1 -> v2.6.25-rc3-git1
* [new tag] v2.6.26-git4 -> v2.6.26-git4
* [new tag] v2.6.26-git6 -> v2.6.26-git6
* [new tag] v2.6.26-git9 -> v2.6.26-git9
* [new tag] v2.6.26-rc1-git1 -> v2.6.26-rc1-git1
* [new tag] v2.6.26-rc1-git2 -> v2.6.26-rc1-git2
* [new tag] v2.6.26-rc1-git3 -> v2.6.26-rc1-git3
* [new tag] v2.6.26-rc1-git4 -> v2.6.26-rc1-git4
* [new tag] v2.6.26-rc1-git5 -> v2.6.26-rc1-git5
* [new tag] v2.6.26-rc1-git6 -> v2.6.26-rc1-git6
* [new tag] v2.6.26-rc1-git7 -> v2.6.26-rc1-git7
* [new tag] v2.6.26-rc1-git8 -> v2.6.26-rc1-git8
* [new tag] v2.6.26-rc1-git9 -> v2.6.26-rc1-git9
* [new tag] v2.6.26-rc2-git1 -> v2.6.26-rc2-git1
* [new tag] v2.6.26-rc2-git2 -> v2.6.26-rc2-git2
* [new tag] v2.6.26-rc2-git5 -> v2.6.26-rc2-git5
* [new tag] v2.6.26-rc5-git6 -> v2.6.26-rc5-git6
* [new tag] v2.6.27-git1 -> v2.6.27-git1
* [new tag] v2.6.27-git2 -> v2.6.27-git2
* [new tag] v2.6.27-git3 -> v2.6.27-git3
* [new tag] v2.6.27-git4 -> v2.6.27-git4
* [new tag] v2.6.27-git5 -> v2.6.27-git5
* [new tag] v2.6.27-git7 -> v2.6.27-git7
* [new tag] v2.6.29-git1 -> v2.6.29-git1
* [new tag] v2.6.29-git10 -> v2.6.29-git10
* [new tag] v2.6.29-git11 -> v2.6.29-git11
* [new tag] v2.6.29-git14 -> v2.6.29-git14
* [new tag] v2.6.29-git2 -> v2.6.29-git2
* [new tag] v2.6.29-git3 -> v2.6.29-git3
* [new tag] v2.6.29-git6 -> v2.6.29-git6
* [new tag] v2.6.29-git8 -> v2.6.29-git8
* [new tag] v2.6.29-git9 -> v2.6.29-git9
* [new tag] v2.6.29-rc5-git5 -> v2.6.29-rc5-git5
* [new tag] v2.6.30-git11 -> v2.6.30-git11
* [new tag] v2.6.30-git14 -> v2.6.30-git14
* [new tag] v2.6.30-git20 -> v2.6.30-git20
* [new tag] v2.6.30-git3 -> v2.6.30-git3
* [new tag] v2.6.30-git4 -> v2.6.30-git4
* [new tag] v2.6.30-rc1-git2 -> v2.6.30-rc1-git2
* [new tag] v2.6.30-rc1-git3 -> v2.6.30-rc1-git3
* [new tag] v2.6.30-rc1-git4 -> v2.6.30-rc1-git4
* [new tag] v2.6.30-rc1-git5 -> v2.6.30-rc1-git5
* [new tag] v2.6.30-rc3-git1 -> v2.6.30-rc3-git1
* [new tag] v2.6.30-rc3-git2 -> v2.6.30-rc3-git2
* [new tag] v2.6.31-git1 -> v2.6.31-git1
* [new tag] v2.6.31-git10 -> v2.6.31-git10
* [new tag] v2.6.31-git11 -> v2.6.31-git11
* [new tag] v2.6.31-git12 -> v2.6.31-git12
* [new tag] v2.6.31-git13 -> v2.6.31-git13
* [new tag] v2.6.31-git14 -> v2.6.31-git14
* [new tag] v2.6.31-git15 -> v2.6.31-git15
* [new tag] v2.6.31-git16 -> v2.6.31-git16
* [new tag] v2.6.31-git17 -> v2.6.31-git17
* [new tag] v2.6.31-git18 -> v2.6.31-git18
* [new tag] v2.6.31-git2 -> v2.6.31-git2
* [new tag] v2.6.31-git3 -> v2.6.31-git3
* [new tag] v2.6.31-git4 -> v2.6.31-git4
* [new tag] v2.6.31-git5 -> v2.6.31-git5
* [new tag] v2.6.31-git6 -> v2.6.31-git6
* [new tag] v2.6.31-git7 -> v2.6.31-git7
* [new tag] v2.6.31-git8 -> v2.6.31-git8
* [new tag] v2.6.31-git9 -> v2.6.31-git9
* [new tag] v2.6.32-git1 -> v2.6.32-git1
* [new tag] v2.6.32-git10 -> v2.6.32-git10
* [new tag] v2.6.32-git11 -> v2.6.32-git11
* [new tag] v2.6.32-git12 -> v2.6.32-git12
* [new tag] v2.6.32-git13 -> v2.6.32-git13
* [new tag] v2.6.32-git14 -> v2.6.32-git14
* [new tag] v2.6.32-git15 -> v2.6.32-git15
* [new tag] v2.6.32-git2 -> v2.6.32-git2
* [new tag] v2.6.32-git3 -> v2.6.32-git3
* [new tag] v2.6.32-git4 -> v2.6.32-git4
* [new tag] v2.6.32-git5 -> v2.6.32-git5
* [new tag] v2.6.32-git6 -> v2.6.32-git6
* [new tag] v2.6.32-git7 -> v2.6.32-git7
* [new tag] v2.6.32-git8 -> v2.6.32-git8
* [new tag] v2.6.32-git9 -> v2.6.32-git9
* [new tag] v2.6.32-rc1-git1 -> v2.6.32-rc1-git1
* [new tag] v2.6.32-rc1-git2 -> v2.6.32-rc1-git2
* [new tag] v2.6.32-rc1-git3 -> v2.6.32-rc1-git3
* [new tag] v2.6.32-rc1-git4 -> v2.6.32-rc1-git4
* [new tag] v2.6.33-git1 -> v2.6.33-git1
* [new tag] v2.6.33-git10 -> v2.6.33-git10
* [new tag] v2.6.33-git11 -> v2.6.33-git11
* [new tag] v2.6.33-git12 -> v2.6.33-git12
* [new tag] v2.6.33-git13 -> v2.6.33-git13
* [new tag] v2.6.33-git14 -> v2.6.33-git14
* [new tag] v2.6.33-git15 -> v2.6.33-git15
* [new tag] v2.6.33-git2 -> v2.6.33-git2
* [new tag] v2.6.33-git3 -> v2.6.33-git3
* [new tag] v2.6.33-git4 -> v2.6.33-git4
* [new tag] v2.6.33-git5 -> v2.6.33-git5
* [new tag] v2.6.33-git6 -> v2.6.33-git6
* [new tag] v2.6.33-git7 -> v2.6.33-git7
* [new tag] v2.6.33-git8 -> v2.6.33-git8
* [new tag] v2.6.33-git9 -> v2.6.33-git9
* [new tag] v2.6.33-rc1-git1 -> v2.6.33-rc1-git1
* [new tag] v2.6.33-rc1-git2 -> v2.6.33-rc1-git2
* [new tag] v2.6.33-rc1-git3 -> v2.6.33-rc1-git3
* [new tag] v2.6.33-rc1-git4 -> v2.6.33-rc1-git4
* [new tag] v2.6.33-rc2-git1 -> v2.6.33-rc2-git1
* [new tag] v2.6.33-rc2-git2 -> v2.6.33-rc2-git2
* [new tag] v2.6.33-rc2-git3 -> v2.6.33-rc2-git3
* [new tag] v2.6.33-rc2-git4 -> v2.6.33-rc2-git4
* [new tag] v2.6.33-rc2-git5 -> v2.6.33-rc2-git5
* [new tag] v2.6.33-rc2-git6 -> v2.6.33-rc2-git6
* [new tag] v2.6.33-rc3-git1 -> v2.6.33-rc3-git1
* [new tag] v2.6.33-rc3-git2 -> v2.6.33-rc3-git2
* [new tag] v2.6.33-rc3-git3 -> v2.6.33-rc3-git3
* [new tag] v2.6.33-rc3-git4 -> v2.6.33-rc3-git4
* [new tag] v2.6.33-rc3-git5 -> v2.6.33-rc3-git5
* [new tag] v2.6.33-rc4-git1 -> v2.6.33-rc4-git1
* [new tag] v2.6.33-rc4-git2 -> v2.6.33-rc4-git2
* [new tag] v2.6.33-rc4-git3 -> v2.6.33-rc4-git3
* [new tag] v2.6.33-rc4-git4 -> v2.6.33-rc4-git4
* [new tag] v2.6.33-rc4-git5 -> v2.6.33-rc4-git5
* [new tag] v2.6.33-rc4-git6 -> v2.6.33-rc4-git6
* [new tag] v2.6.33-rc4-git7 -> v2.6.33-rc4-git7
* [new tag] v2.6.33-rc5-git1 -> v2.6.33-rc5-git1
* [new tag] v2.6.33-rc5-git2 -> v2.6.33-rc5-git2
* [new tag] v2.6.33-rc5-git3 -> v2.6.33-rc5-git3
* [new tag] v2.6.33-rc5-git4 -> v2.6.33-rc5-git4
* [new tag] v2.6.33-rc5-git5 -> v2.6.33-rc5-git5
* [new tag] v2.6.33-rc5-git6 -> v2.6.33-rc5-git6
* [new tag] v2.6.33-rc6-git1 -> v2.6.33-rc6-git1
* [new tag] v2.6.33-rc6-git2 -> v2.6.33-rc6-git2
* [new tag] v2.6.33-rc6-git3 -> v2.6.33-rc6-git3
* [new tag] v2.6.33-rc6-git4 -> v2.6.33-rc6-git4
* [new tag] v2.6.33-rc6-git5 -> v2.6.33-rc6-git5
* [new tag] v2.6.33-rc6-git6 -> v2.6.33-rc6-git6
* [new tag] v2.6.33-rc7-git1 -> v2.6.33-rc7-git1
* [new tag] v2.6.33-rc7-git2 -> v2.6.33-rc7-git2
* [new tag] v2.6.33-rc7-git3 -> v2.6.33-rc7-git3
* [new tag] v2.6.33-rc7-git4 -> v2.6.33-rc7-git4
* [new tag] v2.6.33-rc7-git5 -> v2.6.33-rc7-git5
* [new tag] v2.6.33-rc7-git6 -> v2.6.33-rc7-git6
* [new tag] v2.6.33-rc8-git1 -> v2.6.33-rc8-git1
* [new tag] v2.6.33-rc8-git2 -> v2.6.33-rc8-git2
* [new tag] v2.6.33-rc8-git3 -> v2.6.33-rc8-git3
* [new tag] v2.6.33-rc8-git4 -> v2.6.33-rc8-git4
* [new tag] v2.6.33-rc8-git5 -> v2.6.33-rc8-git5
* [new tag] v2.6.33-rc8-git6 -> v2.6.33-rc8-git6
* [new tag] v2.6.33-rc8-git7 -> v2.6.33-rc8-git7
* [new tag] v2.6.33-rc8-git8 -> v2.6.33-rc8-git8
* [new tag] v2.6.33-rc8-git9 -> v2.6.33-rc8-git9
* [new tag] v2.6.34-git1 -> v2.6.34-git1
* [new tag] v2.6.34-git13 -> v2.6.34-git13
* [new tag] v2.6.34-git14 -> v2.6.34-git14
* [new tag] v2.6.34-git15 -> v2.6.34-git15
* [new tag] v2.6.34-git16 -> v2.6.34-git16
* [new tag] v2.6.34-git2 -> v2.6.34-git2
* [new tag] v2.6.34-git3 -> v2.6.34-git3
* [new tag] v2.6.34-git4 -> v2.6.34-git4
* [new tag] v2.6.34-git5 -> v2.6.34-git5
* [new tag] v2.6.34-git6 -> v2.6.34-git6
* [new tag] v2.6.34-git7 -> v2.6.34-git7
* [new tag] v2.6.34-git8 -> v2.6.34-git8
* [new tag] v2.6.34-rc1-git2 -> v2.6.34-rc1-git2
* [new tag] v2.6.34-rc1-git3 -> v2.6.34-rc1-git3
* [new tag] v2.6.34-rc1-git4 -> v2.6.34-rc1-git4
* [new tag] v2.6.34-rc1-git5 -> v2.6.34-rc1-git5
* [new tag] v2.6.34-rc1-git6 -> v2.6.34-rc1-git6
* [new tag] v2.6.34-rc1-git7 -> v2.6.34-rc1-git7
* [new tag] v2.6.34-rc1-git8 -> v2.6.34-rc1-git8
* [new tag] v2.6.34-rc1-git9 -> v2.6.34-rc1-git9
* [new tag] v2.6.34-rc2-git1 -> v2.6.34-rc2-git1
* [new tag] v2.6.34-rc2-git2 -> v2.6.34-rc2-git2
* [new tag] v2.6.34-rc2-git3 -> v2.6.34-rc2-git3
* [new tag] v2.6.34-rc2-git4 -> v2.6.34-rc2-git4
* [new tag] v2.6.34-rc3-git1 -> v2.6.34-rc3-git1
* [new tag] v2.6.34-rc3-git10 -> v2.6.34-rc3-git10
* [new tag] v2.6.34-rc3-git2 -> v2.6.34-rc3-git2
* [new tag] v2.6.34-rc3-git3 -> v2.6.34-rc3-git3
* [new tag] v2.6.34-rc3-git4 -> v2.6.34-rc3-git4
* [new tag] v2.6.34-rc3-git5 -> v2.6.34-rc3-git5
* [new tag] v2.6.34-rc3-git6 -> v2.6.34-rc3-git6
* [new tag] v2.6.34-rc3-git7 -> v2.6.34-rc3-git7
* [new tag] v2.6.34-rc3-git8 -> v2.6.34-rc3-git8
* [new tag] v2.6.34-rc3-git9 -> v2.6.34-rc3-git9
* [new tag] v2.6.34-rc4-git1 -> v2.6.34-rc4-git1
* [new tag] v2.6.34-rc4-git2 -> v2.6.34-rc4-git2
* [new tag] v2.6.34-rc4-git3 -> v2.6.34-rc4-git3
* [new tag] v2.6.34-rc4-git4 -> v2.6.34-rc4-git4
* [new tag] v2.6.34-rc4-git5 -> v2.6.34-rc4-git5
* [new tag] v2.6.34-rc4-git6 -> v2.6.34-rc4-git6
* [new tag] v2.6.34-rc5-git1 -> v2.6.34-rc5-git1
* [new tag] v2.6.34-rc5-git10 -> v2.6.34-rc5-git10
* [new tag] v2.6.34-rc5-git2 -> v2.6.34-rc5-git2
* [new tag] v2.6.34-rc5-git3 -> v2.6.34-rc5-git3
* [new tag] v2.6.34-rc5-git4 -> v2.6.34-rc5-git4
* [new tag] v2.6.34-rc5-git5 -> v2.6.34-rc5-git5
* [new tag] v2.6.34-rc5-git6 -> v2.6.34-rc5-git6
* [new tag] v2.6.34-rc5-git7 -> v2.6.34-rc5-git7
* [new tag] v2.6.34-rc5-git8 -> v2.6.34-rc5-git8
* [new tag] v2.6.34-rc5-git9 -> v2.6.34-rc5-git9
* [new tag] v2.6.34-rc6-git1 -> v2.6.34-rc6-git1
* [new tag] v2.6.34-rc6-git2 -> v2.6.34-rc6-git2
* [new tag] v2.6.34-rc6-git3 -> v2.6.34-rc6-git3
* [new tag] v2.6.34-rc6-git4 -> v2.6.34-rc6-git4
* [new tag] v2.6.34-rc6-git5 -> v2.6.34-rc6-git5
* [new tag] v2.6.34-rc6-git6 -> v2.6.34-rc6-git6
* [new tag] v2.6.34-rc7-git1 -> v2.6.34-rc7-git1
* [new tag] v2.6.34-rc7-git2 -> v2.6.34-rc7-git2
* [new tag] v2.6.34-rc7-git3 -> v2.6.34-rc7-git3
* [new tag] v2.6.34-rc7-git4 -> v2.6.34-rc7-git4
* [new tag] v2.6.34-rc7-git5 -> v2.6.34-rc7-git5
* [new tag] v2.6.34-rc7-git6 -> v2.6.34-rc7-git6
* [new tag] v2.6.34-rc7-git7 -> v2.6.34-rc7-git7
* [new tag] v2.6.34-rc7-git8 -> v2.6.34-rc7-git8
* [new tag] v2.6.34-rc7-git9 -> v2.6.34-rc7-git9
* [new tag] v2.6.35-git1 -> v2.6.35-git1
* [new tag] v2.6.35-git10 -> v2.6.35-git10
* [new tag] v2.6.35-git2 -> v2.6.35-git2
* [new tag] v2.6.35-git3 -> v2.6.35-git3
* [new tag] v2.6.35-git4 -> v2.6.35-git4
* [new tag] v2.6.35-git5 -> v2.6.35-git5
* [new tag] v2.6.35-git6 -> v2.6.35-git6
* [new tag] v2.6.35-git7 -> v2.6.35-git7
* [new tag] v2.6.35-git8 -> v2.6.35-git8
* [new tag] v2.6.35-git9 -> v2.6.35-git9
* [new tag] v2.6.35-rc1-git1 -> v2.6.35-rc1-git1
* [new tag] v2.6.35-rc1-git2 -> v2.6.35-rc1-git2
* [new tag] v2.6.35-rc1-git3 -> v2.6.35-rc1-git3
* [new tag] v2.6.35-rc1-git4 -> v2.6.35-rc1-git4
* [new tag] v2.6.35-rc1-git5 -> v2.6.35-rc1-git5
* [new tag] v2.6.35-rc2-git1 -> v2.6.35-rc2-git1
* [new tag] v2.6.35-rc2-git2 -> v2.6.35-rc2-git2
* [new tag] v2.6.35-rc2-git3 -> v2.6.35-rc2-git3
* [new tag] v2.6.35-rc2-git4 -> v2.6.35-rc2-git4
* [new tag] v2.6.35-rc2-git5 -> v2.6.35-rc2-git5
* [new tag] v2.6.35-rc2-git6 -> v2.6.35-rc2-git6
* [new tag] v2.6.35-rc3-git1 -> v2.6.35-rc3-git1
* [new tag] v2.6.35-rc3-git2 -> v2.6.35-rc3-git2
* [new tag] v2.6.35-rc3-git3 -> v2.6.35-rc3-git3
* [new tag] v2.6.35-rc3-git4 -> v2.6.35-rc3-git4
* [new tag] v2.6.35-rc3-git5 -> v2.6.35-rc3-git5
* [new tag] v2.6.35-rc3-git6 -> v2.6.35-rc3-git6
* [new tag] v2.6.35-rc3-git7 -> v2.6.35-rc3-git7
* [new tag] v2.6.35-rc3-git8 -> v2.6.35-rc3-git8
* [new tag] v2.6.35-rc4-git1 -> v2.6.35-rc4-git1
* [new tag] v2.6.35-rc4-git2 -> v2.6.35-rc4-git2
* [new tag] v2.6.35-rc4-git3 -> v2.6.35-rc4-git3
* [new tag] v2.6.35-rc4-git4 -> v2.6.35-rc4-git4
* [new tag] v2.6.35-rc4-git5 -> v2.6.35-rc4-git5
* [new tag] v2.6.35-rc5-git1 -> v2.6.35-rc5-git1
* [new tag] v2.6.35-rc5-git2 -> v2.6.35-rc5-git2
* [new tag] v2.6.35-rc5-git3 -> v2.6.35-rc5-git3
* [new tag] v2.6.35-rc5-git4 -> v2.6.35-rc5-git4
* [new tag] v2.6.35-rc5-git5 -> v2.6.35-rc5-git5
* [new tag] v2.6.35-rc5-git6 -> v2.6.35-rc5-git6
* [new tag] v2.6.35-rc5-git7 -> v2.6.35-rc5-git7
* [new tag] v2.6.35-rc6-git1 -> v2.6.35-rc6-git1
* [new tag] v2.6.35-rc6-git2 -> v2.6.35-rc6-git2
* [new tag] v2.6.35-rc6-git3 -> v2.6.35-rc6-git3
* [new tag] v2.6.35-rc6-git4 -> v2.6.35-rc6-git4
* [new tag] v2.6.35-rc6-git5 -> v2.6.35-rc6-git5
* [new tag] v2.6.35-rc6-git6 -> v2.6.35-rc6-git6
warning: too many files (created: 1262 deleted: 323), skipping inexact rename detection
warning: too many files (created: 645 deleted: 441), skipping inexact rename detection
Auto-merging Documentation/feature-removal-schedule.txt
Auto-merging Documentation/filesystems/proc.txt
Auto-merging Kbuild
Auto-merging MAINTAINERS
Auto-merging arch/mn10300/Kconfig
CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
Removing arch/mn10300/mm/cache-flush-mn10300.S
Removing arch/mn10300/mm/cache-mn10300.S
Auto-merging arch/x86/xen/enlighten.c
Auto-merging drivers/gpio/Kconfig
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/media/IR/lirc_dev.c
Auto-merging drivers/net/Kconfig
Auto-merging drivers/pci/proc.c
Auto-merging drivers/rtc/Kconfig
Auto-merging drivers/rtc/Makefile
Auto-merging fs/Kconfig
Auto-merging fs/ext4/block_validity.c
Auto-merging fs/ext4/ext4.h
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Auto-merging fs/ext4/extents.c
CONFLICT (content): Merge conflict in fs/ext4/extents.c
Auto-merging fs/ext4/ialloc.c
CONFLICT (content): Merge conflict in fs/ext4/ialloc.c
Auto-merging fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Auto-merging fs/ext4/mballoc.c
Auto-merging fs/ext4/page-io.c
CONFLICT (add/add): Merge conflict in fs/ext4/page-io.c
Auto-merging fs/ext4/resize.c
Auto-merging fs/ext4/super.c
CONFLICT (content): Merge conflict in fs/ext4/super.c
Auto-merging fs/jbd2/journal.c
Auto-merging include/linux/fs.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/syscalls.h
Auto-merging include/trace/events/ext4.h
CONFLICT (content): Merge conflict in include/trace/events/ext4.h
Auto-merging kernel/resource.c
Automatic merge failed; fix conflicts and then commit the result.
sd@tbox:/mnt/sdb5/linux-next/linux-next$
[-- Attachment #3: MERGE_CONFLICT_linux-2.6 --]
[-- Type: application/octet-stream, Size: 2368 bytes --]
sd@tbox:/mnt/sdb5/linux-next/linux-next$ git pull git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git master:linux-2.6
remote: Counting objects: 22442, done.
remote: Compressing objects: 100% (4051/4051), done.
remote: Total 18452 (delta 14949), reused 17526 (delta 14116)
Receiving objects: 100% (18452/18452), 3.90 MiB | 619 KiB/s, done.
Resolving deltas: 100% (14949/14949), completed with 2452 local objects.
From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
* [new branch] master -> linux-2.6
warning: too many files (created: 1263 deleted: 324), skipping inexact rename detection
warning: too many files (created: 645 deleted: 441), skipping inexact rename detection
Auto-merging Documentation/feature-removal-schedule.txt
Auto-merging Documentation/filesystems/proc.txt
Auto-merging Kbuild
Auto-merging MAINTAINERS
Auto-merging arch/mn10300/Kconfig
CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
Removing arch/mn10300/mm/cache-flush-mn10300.S
Removing arch/mn10300/mm/cache-mn10300.S
Auto-merging arch/x86/xen/enlighten.c
Auto-merging drivers/gpio/Kconfig
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/media/IR/lirc_dev.c
Auto-merging drivers/net/Kconfig
Auto-merging drivers/pci/proc.c
Auto-merging drivers/rtc/Kconfig
Auto-merging drivers/rtc/Makefile
Auto-merging fs/Kconfig
Auto-merging fs/ext3/inode.c
Auto-merging fs/ext3/super.c
Auto-merging fs/ext4/block_validity.c
Auto-merging fs/ext4/ext4.h
CONFLICT (content): Merge conflict in fs/ext4/ext4.h
Auto-merging fs/ext4/extents.c
CONFLICT (content): Merge conflict in fs/ext4/extents.c
Auto-merging fs/ext4/ialloc.c
CONFLICT (content): Merge conflict in fs/ext4/ialloc.c
Auto-merging fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Auto-merging fs/ext4/mballoc.c
Auto-merging fs/ext4/page-io.c
CONFLICT (add/add): Merge conflict in fs/ext4/page-io.c
Auto-merging fs/ext4/resize.c
Auto-merging fs/ext4/super.c
CONFLICT (content): Merge conflict in fs/ext4/super.c
Auto-merging include/linux/fs.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/syscalls.h
Auto-merging include/trace/events/ext4.h
CONFLICT (content): Merge conflict in include/trace/events/ext4.h
Auto-merging kernel/resource.c
Automatic merge failed; fix conflicts and then commit the result.
sd@tbox:/mnt/sdb5/linux-next/linux-next$
next prev parent reply other threads:[~2010-10-28 15:08 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 10:05 [next-20101038] Call trace in ext4 Sedat Dilek
2010-10-28 10:34 ` [next-20101028] " Sedat Dilek
2010-10-28 15:08 ` Sedat Dilek [this message]
2010-10-28 15:27 ` Ted Ts'o
2010-10-28 17:52 ` [next-20101038] " Markus Trippelsdorf
2010-10-28 18:01 ` Ted Ts'o
2010-10-28 18:16 ` Eric Sandeen
2010-10-28 19:32 ` Ted Ts'o
2010-10-28 19:36 ` Eric Sandeen
2010-10-28 19:54 ` Ted Ts'o
2010-10-28 19:54 ` Sedat Dilek
2010-10-28 20:05 ` Ted Ts'o
2010-10-28 20:15 ` Sedat Dilek
2010-10-28 20:37 ` Ted Ts'o
2010-10-28 21:02 ` Sedat Dilek
2010-10-28 21:06 ` Ted Ts'o
2010-10-28 21:17 ` Sedat Dilek
2010-10-28 18:20 ` Sedat Dilek
2010-10-28 18:34 ` Sedat Dilek
2010-10-28 18:55 ` Ted Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTinOoxB4FnVXm1sSbW7zbdrEpA_dYzphh0CEWr-8@mail.gmail.com \
--to=sedat.dilek@googlemail.com \
--cc=arnd@arndb.de \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sedat.dilek@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).