[AUTO-REBASE-FULLOG] UNATTENDED

Lee Jones lag at igloocommunity.org
Wed May 23 00:37:14 UTC 2012 

Fetching mainline
Fetching igloo_kernel
Fetching glo-working

============================================================================================
Rebasing tracking-igloo_kernel-audio onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-audio

First, rewinding head to replay your work on top of it...
Applying: misc: Add audio_io_dev driver
Applying: misc: Add i2s driver
Applying: spi: add stm msp driver
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/mach-ux500/include/mach/msp.h
CONFLICT (add/add): Merge conflict in arch/arm/mach-ux500/include/mach/msp.h
Failed to merge in the changes.
Patch failed at 0003 spi: add stm msp driver

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-audio has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/include/mach/msp.h
#### Counting how many more conflicts there would have been
................... - tracking-igloo_kernel-audio will fail 19 more times ####


Failed to auto-resolve
HEAD is now at 9a55852 sound: ab8500: Fix API change in 3.4 snd suspend

============================================================================================
Rebasing tracking-igloo_kernel-caif onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-caif

First, rewinding head to replay your work on top of it...
Applying: CAIF: Minor alignment with internal CAIF git
Applying: caif-shm: synchronize caif flow control
Applying: caif-shmcore: increase the priority of flow control wq
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/caif/caif_shmcore.c
CONFLICT (content): Merge conflict in drivers/net/caif/caif_shmcore.c
Failed to merge in the changes.
Patch failed at 0003 caif-shmcore: increase the priority of flow control wq

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-caif has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/net/caif/caif_shmcore.c
#### Counting how many more conflicts there would have been
 - tracking-igloo_kernel-caif will fail 0 more times ####


Failed to auto-resolve
HEAD is now at 711ac22 caif-shmcore: in tx check for buffer full condition

============================================================================================
Rebasing tracking-igloo_kernel-cg2900 onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-cg2900

First, rewinding head to replay your work on top of it...
Applying: staging: Add ST-Ericsson CG2900 driver
Applying: cg2900: Add regulator support
Applying: cg2900: Fix chip enable
Applying: staging: cg2900: Update for api change in 3.0
Applying: staging: cg2900: Fix for gpio header move
Applying: cg2900: Fix crash when transport is closed
Applying: cg2900: Disable chip when init failed
Applying: mfd/cg2900: Fix for memory leak when using logger.
Applying: cg2900: Use correct struct for SCO start stream
Applying: cg2900: Do not send RX data to wrong user
Applying: cg2900: Add pdata_size to mfd_cell
Applying: cg2900: Delay creation of MFD devices
Applying: Adding a delay to CG2900 enable to make the chip start up correctly
Applying: cg2900: bluetooth support for 5500
Applying: cg2900: Fix for not working BT on hrefp V71
Applying: cg2900: Fix checkpatch issues
Applying: cg2900: Set WLAN_PMU_EN for startup
Applying: u9500: GPIO conflicts with external modem
Applying: Revert "cg2900: bluetooth support for 5500"
Applying: cg2900: bluetooth support for 5500
Applying: cg2900: Set WLAN_PMU_EN for startup
Applying: u9500: cg2900: GPIO conflicts with external modem
Applying: cg2900: Add KernelDoc
Applying: ux500: use updated gpio driver
Applying: cg2900: prcmu: fix path to header file
Applying: cg2900: u5500: Make ux500 play nice at build time
Applying: cg2900: Fix merge problems
Applying: cg2900: Use correct platform_data
Applying: cg2900: Register CG2900 as clock source for wlan
Applying: cg2900: Fix after 3.1 rebase
Applying: mfd/cg2900: Support HCI Raw Channel.
Applying: mfd/cg2900: Error opening HCI Raw Channel
Applying: cg2900: Use PM QoS for CG2900 UART
Applying: cg2900: Use Dynamic Machine configuration.
Applying: cg2900: Fix Memory Leak during Driver Init.
Applying: cg2900: Add support for 3.25 Mbps
Applying: staging: Add ST-Ericsson CG2900 driver compilation
Applying: cg2900: updates for 3.2
Applying: cg2900: Fix for race condition
Applying: cg2900: [U9500] Correct the GPIO configuration for WLAN
Applying: cg2900: Changes for porting on 3.3
Applying: cg2900: Code optimizations for CG2900 init time
Applying: CG2900: Fix timings for CG29XX during break
Applying: CG2900: changing sleep timers
Applying: cg2900: Support new connectivity chips
Applying: cg2900: Wrong sequence number from CG2910/05
Applying: cg2900: firmware download at 115kbps CG2910/05
Applying: cg2900: Add support for 9540
Applying: cg2900: Fix FM audio issues on cg2905/10
Applying: cg2900: ux500: Add U8520 machine
Applying: cg2900: Change the PMU_EN gpio for snowball
Applying: cg2900: Include missing <linux/mutex.h> for 3.4
Applying: cg2900: bluetooth: Porting onto new 3.4 API

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-cg2900-fm onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-cg2900-fm

First, rewinding head to replay your work on top of it...
Applying: CG2900 FM radio: Add support for Tone Gen and De-emphasis.
Applying: CG2900 FM Radio: RDS decoding time is too long.
Applying: CG2900 FM Radio: Handling Mono-Stereo Interrupt.
Applying: CG2900 FM Radio: CG2900 stops responding in FM Tx.
Applying: CG2900 FM Radio: BandScan IOCTL Calls Hangs.
Applying: CG2900 FM Radio: Adapt to kernel 3.0
Applying: CG2900 FM Radio: Block Scan not working for non EU bands.
Applying: CG2900 FM Radio: RDS data cannot be retrieved.
Applying: CG2900 FM Radio: Improper RDS Thread handling.
Applying: CG2900 FM Radio: Fix improper handling of response buffer
Applying: FM Radio: Update FM driver for CG2910/05
Applying: FM Radio: Remove analog volume control - CG2910/05
Applying: cg2900: fm_driver: Fix warning
Applying: CG2900 FM Radio: Implement FMR_RP_Stereo_SetControl_BlendingRSSI
Applying: G2900 FM Radio: Disable RDS Group rejection

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-core onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-core

First, rewinding head to replay your work on top of it...
Applying: ARM: kernel: smp_twd: Add save/restore functions
Applying: fix build errors with CPU_IDLE enabled
Applying: ARM: smp: don't recalculate loops_per_jiffy
Applying: misc/bh1780gli: add PM features
Applying: mpcore_wdt: Set correct watchdog rate
Applying: amba-pl022: Initialize burstsize from FIFO trigger level
Applying: arm: allow passing an ELF64 header to elf_check_arch() Signed-off-by: Per Fransson <per.xx.fransson at stericsson.com>
Applying: mpcore_wdt: Stop watchdog of non-crashing cores
Applying: mfd: stmpe: Recheck the status to avoid failure stmpe: add stmpe documentation to DocBook
Applying: i2c: nomadic-i2c driver updates for clock and power, busy management
Applying: nmk-i2c: use pm_runtime API
Applying: i2c-nomadik: Add code to retry on timeout failure and set i2c clock to 400KHz
Applying: nmk-i2c: use pm_runtime API
Applying: i2c-nomadik: Add code to retry on timeout failure and set i2c clock to 400KHz
Applying: backlight/leds: add low threshold to pwm backlight/led
Applying: abx500: big merge from GLK 2.6.35
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/mfd/Kconfig
Auto-merging drivers/mfd/Makefile
Applying: hwmon db8500: update for new prcmu interface
Applying: ux500-ARM : make backup RAM as an executable area
Applying: ARM : handle preempt count in cpu_idle
Applying: u8500: enable u8500 configurations
Applying: Add clean and flush_dcache_all to ARM cache API
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/include/asm/cacheflush.h
Auto-merging arch/arm/mm/cache-v3.S
Auto-merging arch/arm/mm/cache-v4.S
Auto-merging arch/arm/mm/cache-v4wb.S
Auto-merging arch/arm/mm/cache-v4wt.S
Auto-merging arch/arm/mm/cache-v6.S
Auto-merging arch/arm/mm/cache-v7.S
Applying: ARM: Translate delay.S into (mostly) C
Applying: ARM: Allow machines to override __delay()
Applying: ARM: Implement a timer based __delay() loop
Applying: ARM: kernel: Remove warnings
Applying: Adding configuration options for cg2900.
Applying: amba-pl022: Add loopback support for the SPI on 5500
Applying: mfd: add a core driver for TI TPS61050/TPS61052 chips v2
Applying: BH1780: Fix regulator name
Applying: ux500: Align u8500 defconfig with 2.6.35 one, u5500 is enabled too
Applying: Update USB configurations in u8500_defconfig
Applying: wdt: Warnings fix
Applying: ux500: Adding board, smsc911x and DHCP configuration for snowball
Applying: mach-ux500: cleanup u8500_defconfig
Applying: ux500:Removing warnings from USB
Applying: i2c-nomadik: Remove the unnecessary delay
Applying: mfd: ab8500_gpadc: Corrected the name and bitmask for BTempPullUp
Applying: DB Thermal Driver: Add label,min/max_alarm
Applying: drivers: video: add regulator for CVBS out
Applying: setlocalversion: Add support for version from specific tag
Applying: bh1780gli: correct mutex locking behaviour
Applying: rtc: add AB5500 RTC driver
Applying: rtc-ab: add missing casts
Applying: ab8500 debugfs: formated access AB8500 registers from debugfs entry
Applying: ARM: enable CONFIG_KTIME_SCALAR
Applying: ARM: Fix buffer overflow if HZ=1000
Applying: i2c-nomadik: Reset the hw after status check
Applying: arm: ux500: change the ab8500-pwm clock from sysclk to ab_ulpclk
Applying: abx500: provide simpler function names
Applying: ab5500: provide a driver for power off
Applying: ab5500: leds: driver for ab5500 leds
Applying: Fix Introduced warnings
Applying: mach-ux500: ux500 defconfig update
Applying: cw1200: Enable WEXT compatibility.
Applying: serial: pl011: Fix enable of pins
Applying: config: Add fixed regulator driver
Applying: config: Add cg2900 deps BT and HCIUART
Applying: mfd: abx500: Move ab5500 include
Applying: config: u8500: Enable the new asoc drivers
Applying: arm: add functions to control prefetch in outer_cache_fns
Applying: u5500: support RTC_CLK1/2
Applying: kernel-doc: fix kernel-doc warnings
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/pinctrl/pinctrl-nomadik.c
Applying: AB5500: AB5500 Analog to Digital conversion driver
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/mfd/Kconfig
Auto-merging drivers/mfd/Makefile
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Failed to merge in the changes.
Patch failed at 0063 AB5500: AB5500 Analog to Digital conversion driver

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-core has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/mfd/Makefile
#### Counting how many more conflicts there would have been
............................... - tracking-igloo_kernel-core will fail 31 more times ####


Failed to auto-resolve
HEAD is now at 354580c config: Enable PCCARD to set IO_SPACE_LIMIT to 0xffff to avoid failure in IORESOURCE_IO allocation

============================================================================================
Rebasing tracking-igloo_kernel-dma onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-dma

First, rewinding head to replay your work on top of it...
Applying: dma40: Resetting priority bit for logical channels
Applying: dmaengine/ste_dma40: use writel_relaxed for lcxa
Applying: dmaengine/ste_dma40: set dma max seg to 0xffff
Applying: dmaengine/ste_dma40: limit burst size to 16
Applying: dma40: Add the needed functions for STE audio support
Applying: dma40: don't check for pm_runtime_suspended()

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-gpio onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-gpio

First, rewinding head to replay your work on top of it...
Applying: add html doc for ux500 gpio
Applying: mach-ux500: gpio: Moved the NOMADIK_NR_GPIO
Applying: ux500: gpio: move gpio base numbers to platform header
Applying: gpio/nomadik: move the Nomadik GPIO header
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging drivers/pinctrl/pinctrl-nomadik.c
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-nomadik.c
Failed to merge in the changes.
Patch failed at 0004 gpio/nomadik: move the Nomadik GPIO header

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-gpio has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	drivers/pinctrl/pinctrl-nomadik.c
#### Counting how many more conflicts there would have been
... - tracking-igloo_kernel-gpio will fail 3 more times ####


Failed to auto-resolve
HEAD is now at 2371765 ab8500-gpio: allow gpios waking system from suspend

============================================================================================
Rebasing tracking-igloo_kernel-hsi onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-hsi

First, rewinding head to replay your work on top of it...
Applying: HSI: omap_ssi: Introducing OMAP SSI driver
Applying: HSI: omap_ssi: Add OMAP SSI to the kernel configuration
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/mach-omap2/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
Failed to merge in the changes.
Patch failed at 0002 HSI: omap_ssi: Add OMAP SSI to the kernel configuration

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-hsi has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-omap2/Makefile
#### Counting how many more conflicts there would have been
........ - tracking-igloo_kernel-hsi will fail 8 more times ####


Failed to auto-resolve
HEAD is now at 1b88eb4 drivers: hsi: Add CAIF-HSI glue layer

============================================================================================
Rebasing tracking-igloo_kernel-hwmem onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-hwmem

First, rewinding head to replay your work on top of it...
Applying: hwmem: Add hardware memory driver to kernel
Applying: mach-ux500: add dcache necessary for hwmem
Applying: HWMEM: Update API
Applying: HWMEM: Make user space include linux/types.h
Applying: HWMEM: Reset ref count in clean_alloc
Applying: HWMEM: Alloc kernel vaddrs on boot
Applying: HWMEM: Break out allocator
Applying: Lee's chunk to make the kernel compile
Applying: hwmem: Add peak memory usage in debugfs prints
Applying: misc: Compile hwmem misc driver
Applying: ux500: hwmem: Add protected hwmem support
Applying: hwmem: Fix kernel headers check problem

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-input onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-input

First, rewinding head to replay your work on top of it...
Applying: input: update bu21013 touchscreen controller staging: update Synaptics RMI4 touchpad driver
Applying: u5500: add DB5500 keypad driver
Applying: keyboard: add tc35893 driver
Applying: input: abx500: big merge from GLK 2.6.35
Applying: input: Dynamic enable or disable of SKE keypad events
Applying: input: Dynamic enable or disable of STMPE1601 keypad events
Applying: input/keypad-stmpe: add suspend/resume support
Applying: input: Multi key press support is added for SKE keypad
Applying: input:ske: Suspend and resume support for ske keypad
Applying: input:ske: Remove multiple interrupts for each keypress
Applying: input:ske:Decrease the CPU load during continue key press
Applying: input:ske:Add the regulator support in ske driver
Applying: input:ske: Fix rename CONFIG_KEYBOARD_NOMADIK to CONFIG_KEYBOARD_NOMADIK_SKE
Applying: input: Fix warnings
Applying: DocBook: Update tc_keypad doc for new files
Applying: u5500: Fix compilation errors after rmi4 ts driver moved in staging area
Applying: Input: Add AB8500 AV Acc. Detection as platform drv
Applying: input: accdet: Workaround for AB8500 gpio (now use AB8500 offset)
Applying: drivers: input: enable accessory detect on default
Applying: input: misc: ab8500-accdet: Power optimisation fix.
Applying: bu21013: Proper reset implementation during suspend and resume
Applying: ske keypad: Proper regulator and clock framework support
Applying: input: ab8500-ponkey: make generic
Applying: db5500-keypad: remove clk hacks
Applying: db5500-keypad: handle suspend/resume
Applying: input/mfd: AB5500 ONSWa support
Applying: input: ab8500-accdetect suspend modification
Applying: input:ab8500-accdet: Add accessory detect for hrefv60
Applying: ab8500-accdet: Handle interrupts on comparator disable/enable
Applying: input; ab8500 accdet: Fix sparse warnings
Applying: db5500-keypad: fix ROW_SHIFT
Applying: u5500:Docbook:Added the tmpl files for drivers
Applying: input: ske: Fix for gpio header move
Applying: gpio: nomadik: Rename AB8500_GPIO by GPIO_AB8500
Applying: input: fix STMPE keypad input device name by removing spaces
Applying: u5500: ponkey: shutdown time configuration
Applying: ab8500-accdet: Disable vamic1 in suspend
Applying: db5500_keypad: check return values from all calls
Applying: vibrator: Force feedback vibrator driver
Applying: db5500_keypad: handle regulator in apsleep
Applying: db5500_keypad: don't configure all keypad pins
Applying: db5500_keypad: check return value of request_gpio
Applying: ab5500: move to separate header
Applying: input:misc: Add accessory driver
Applying: input: ab8500: update function call for gpio configuration
Applying: input: ab8500: update supply name
Applying: input:misc: Remove TVout support in accessory driver
Applying: input: Report all key actions in SKE autoscan mode
Applying: mach-ux500: bu21013 touchscreen update
Applying: input: ab8500-accdet: Include module.h after 3.2 update
Applying: input: Increase schedule Scan work delay
Applying: input: gpio-keys: Disable hw on suspend
Applying: input: keyboard: nomadik-ske: Do not always enable on suspend
Applying: mach-ux500: add regulator flag for synaptic touchscreen
Applying: abx500-accdet: Enable Vamic1 for the microphone detection
Applying: input:ske:Use gpio mode after resume to save power
Applying: input: ux500: Coding style fixes
Applying: input:ske:Check for ske_enable in resume
Applying: input:db5500:Do not switch to keypad mode always
Applying: input_touchscreen: DocBook: Remove warnings in synaptics driver
Applying: Documentation:add kernel-doc for keypad
Applying: input: ab8500-accdet: Add unsupported hs detection
Applying: input: ab5500 accesory: Add include <linux/module.h>
Applying: skekeypad:Release all acquired resources
Applying: abx500-accdet: fix the kfree bug.
Applying: ux500: rmi4: Align touch with display
Applying: nomadik-ske-keypad: dereference ptr before free
Applying: Nomadik ske: Support keypad smaller than 8x8
Applying: input: misc: abx500-accdet: Change info print to dbg
Applying: input: Removed CVIDEO from accesory detection.
Applying: nomadik-ske-keypad: Stop using already free'd pointer
Applying: input:misc:accdet: Add ab8505 accessory detect support
Applying: ARM: ux500: input: abx500-accdet: Move header file
Applying: drivers: gpio-keys: Add runtime support
Applying: input: ab8500-accdet: Fix after new name param in ab8500_gpadc_get()

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-mach-plat onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-mach-plat

First, rewinding head to replay your work on top of it...
Applying: i2c-nomadik: Change the TX and RX Threshold
Applying: mach-ux500: platform data for HED54XXU11 Hall effect sensor
Applying: mach-ux500: add platform data for PWM leds driver
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/mach-ux500/board-mop500.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
Failed to merge in the changes.
Patch failed at 0003 mach-ux500: add platform data for PWM leds driver

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-mach-plat has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/board-mop500.c
#### Counting how many more conflicts there would have been
............................................................................................................................................................................................................................................................................................................... - tracking-igloo_kernel-mach-plat will fail 303 more times ####


Failed to auto-resolve
HEAD is now at 9d3a1be board-mop500: changing default user_led trigger to heartbeat

============================================================================================
Rebasing tracking-igloo_kernel-mali onto mainline/master - 16951 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-mali

First, rewinding head to replay your work on top of it...
Applying: mali: Add mali400 kernel module
Applying: mali: Include module.h after 3.2 update
Applying: mali: Changes for 3.3

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-modem onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-modem

First, rewinding head to replay your work on top of it...
Applying: drivers: shrm: Add shared memory (shrm) driver
Applying: modem: add mloader and trace features
Applying: shrm: Fix compilation pb after 2.6.38 merge, change ioctl to unlocked_ioctl
Applying: Fix introduced warnings
Applying: MISC: SHRM: Fix build warning
Applying: u8500: shrm: Misc updates and optimisation
Applying: shrm: sw reset: Save SW Reset Reason before reset
Applying: u8500:shrm: Fix null pointer dereference
Applying: u8500: shrm: Workaround for MSR
Applying: u8500: shrm: Update AC_Wake logic and one fix for MSR
Applying: U5500 : Mailbox logical driver.
Applying: kernel-doc: shrm: fix kernel-doc warnings
Applying: mach_ux500: Add support for mloader.
Applying: u5500 : kernel-doc for Mailbox Logical Driver
Applying: arm: ux500: common dbx500 prcmu driver api
Applying: u5500 : Change flag to GFP_ATOMIC for memory req
Applying: mach-ux500: Adapt mloader to new mem layout
Applying: misc: shrm: Remove u8500 ED support
Applying: misc: shrm: Update for header file changes 3.0
Applying: drivers: Add Modem Access Framework
Applying: drivers: modem: Add modem access driver for STE U8500
Applying: u8500: shrm: Adapt to use Modem Access framework
Applying: u8500: shrm: Move shrm to drivers/modem
Applying: Stagging : AB5500 SIM interface Driver
Applying: u8500: shrm: Add support for CIQ L2Mux channel
Applying: U8500 : driver for awaking modem on sim hot swap activity
Applying: U8500: change GPIO for SIM activity detection driver
Applying: Doc: Fixing documentation for html generation
Applying: ux500_ing05160_mailboxLD_0.1 : coverity fix in ab5500 core and mailbox
Applying: ux500_ing05160_mailboxLD_0.1 : Mailbox Logical driver update
Applying: ux500_ing05160_ab5500_sim_0.1: fix the resource leak
Applying: ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irq
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): arch/arm/mach-ux500/modem-irq-db5500.c deleted in HEAD and modified in ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irq. Version ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irq of arch/arm/mach-ux500/modem-irq-db5500.c left in tree.
Failed to merge in the changes.
Patch failed at 0032 ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irq

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-modem has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/modem-irq-db5500.c
#### Counting how many more conflicts there would have been
........ - tracking-igloo_kernel-modem will fail 8 more times ####


Failed to auto-resolve
HEAD is now at 3d9a173 U8500: Make SIM detect work on resume

============================================================================================
Rebasing tracking-igloo_kernel-other onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-other

First, rewinding head to replay your work on top of it...
Applying: bluetooth: Improve BNEP extension headers handling
Applying: bluetooth: Add SCO parameters support for socket
Applying: BT: Add sec_level to auth_conn_info
Applying: snowball: android: Fixing access right for BT
Applying: panic: Call notify before kernel is stopped
Applying: Bluetooth: Set up correct eSCO packet type for incomming connection

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-pm onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-pm

First, rewinding head to replay your work on top of it...
Applying: mfd/db5500-prcmu: update mailbox handling
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): arch/arm/mach-ux500/include/mach/irqs-db5500.h deleted in HEAD and modified in mfd/db5500-prcmu: update mailbox handling. Version mfd/db5500-prcmu: update mailbox handling of arch/arm/mach-ux500/include/mach/irqs-db5500.h left in tree.
CONFLICT (delete/modify): drivers/mfd/db5500-prcmu.c deleted in HEAD and modified in mfd/db5500-prcmu: update mailbox handling. Version mfd/db5500-prcmu: update mailbox handling of drivers/mfd/db5500-prcmu.c left in tree.
Failed to merge in the changes.
Patch failed at 0001 mfd/db5500-prcmu: update mailbox handling

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-pm has 2 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/include/mach/irqs-db5500.h
	drivers/mfd/db5500-prcmu.c
#### Counting how many more conflicts there would have been
.............................................................................................. - tracking-igloo_kernel-pm will fail 94 more times ####


Failed to auto-resolve
HEAD is now at 72a4d32 ux500: regulators: Revert partially mainline changes around audio regulators

============================================================================================
Rebasing tracking-igloo_kernel-security onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-security

First, rewinding head to replay your work on top of it...
Applying: add trusted execution environment (tee) driver
Applying: HCL driver implementation (hash).
Applying: crypto: ux500: Add crypto and hash acceleration
Applying: ux500: tee bug fix for returning wrong values
Applying: ux500: add u5500 specific macros
Applying: V2 fix for TEE
Applying: TEE: Added TEE kernel interface
Applying: cryp: Updates according to corrected design spec
Applying: crypto: ux500: hash: converted to ahash.
Applying: cryp: CPU mode register read/write optimizations
Applying: cryp: Session handling for software context
Applying: ux500: cryp: Remove register access
Applying: ux500: cryp: Use relaxed versions of writel/readl
Applying: ARM: ux500: tee: Remove u8500 v1 support
Applying: crypto: align u5500 PRCMU & CPUFREQ management with u8500 (multiple commits in one)
Applying: crypto: ux500: hash: Empty message support
Applying: crypto: ux500: hash: HMAC (sha1/sha256) support
Applying: ux500: security: update
Applying: ux500: cryp/hash: Updated for both u8500 & u5500
Applying: crypto: ux500: hash: Block size data fix.
Applying: crypto: ux500: update prcmu header file path
Applying: crypto: Move atomic regulator header file
Applying: TEE driver: NULL variable usage
Applying: crypto: ux500: hash: DMA support
Applying: crypto: ux500: hash: Coverity correction
Applying: security: ux500: Coding style fixes
Applying: crypto: ux500: hash: Performance improvements
Applying: ux500: TEE: Moved conversion of virt_to_phys
Applying: ux500: Tee: Use hwmem for memrefs
Applying: mach-ux500, drivers: u9540 security fix
Applying: ARM: ux500: tee: Always assume v2.0 or later
Applying: crypto: ux500: hash: device_prep_slave_sg() has a new context param in 3.4

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-st-mems-sensors onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-st-mems-sensors

First, rewinding head to replay your work on top of it...
Applying: Adding l3g4200d Gyroscope
Applying: hwmon: change L3G4200D regulators name for 2.6.38
Applying: hwmon: add st lsm303dlh driver
Applying: lsm303dlh: Reboot memory content after suspend/resume
Applying: lsm303dlh: Check written values for lsm303dlh_a_write calls
Applying: lsm303dlh/l3g4200d: return count after storing mode
Applying: lsm303dlh: add DocBook documentation
Applying: hwmon: lsm303dlh_m: Fix ifdefs
Applying: hwmon: lsm303dlh_a: Fix ifdefs
Applying: hwmon: l3g4200d: Fix ifdefs
Applying: lsm303dlh: adding functions under CONFIG_SENSORS_INPUT_DEVICE
Applying: drivers:hwmon: add support for lsm303dlhc sensor
Applying: lsm303dlhc: add early suspend support
Applying: lsm303dlh: Detect chip version at run time
Applying: lsm303dlhc: fix !CONFIG_HAS_EARLYSUSPEND build
Applying: lsm303dlhc: Correct out register reading
Applying: hwmon: change regulator for accelerometer
Applying: ux500: Separate sensors and stuib
Applying: input/misc: added lps001wp as internally delivered by ST
Applying: input/misc: fix lps001wp_prs.c so it will compile (next commit)
Applying: drivers/misc: compile lps001wp using a Kconfig entry
Applying: input/misc: Add regulator support to lps001wp
Applying: ux500: Detect accelerometer i2c address on snowball in board sensors file
Applying: sensors: Include module.h after 3.2 update
Applying: mach-ux500: sensors: Add __init directive for mop500_sensors_init()
Applying: hwmon: lsm303dlh: use regulator_set_optimum_mode()
Applying: hwmon: lsm303dlhc_a: use regulator_set_optimum_mode()
Applying: hwmon:(lsm303dlh)enable X, Y and Z axis by default
Applying: drivers: hwmon: l3g4200d: Provide gyroscope temperature via sysfs
Applying: hwmon: add mutex unlock in error cases
Applying: Documentation:add kernel-doc for sensor
Applying: lsm303dlh_m: Check for DLHC device to invert y,z
Applying: mach-ux500: lsm303dh: Read the chip_id of LSM303
Applying: drivers: Change sysfs attributes permission
Applying: lps001wp_prs:add compilation switch for work queue
Applying: [ANDROID]:input:lps001wp_prs:add regulator,sysfs
Applying: mach-ux500: sensors: Change platform data for pressure sensor
Applying: Documentation:add kernel-doc for pressure sensor
Applying: lps001wp_prs:free prs struct after regulator free
Applying: mach-ux500: sensors: move U8500 UIBs sensors management into board-mop500-sensors.c
Applying: lsm303dlhc: Include <linux/module.h>
Applying: mach-ux500: Fix, update Chipid by reading 0x0F register
Applying: lsm303dlh: add support for Android early suspend
Applying: Android:lps001wp: add early suspend,late resume
Applying: input:lps001wp_prs: Correct sysfs file permissions
Applying: hwmon: l3g4200,lsm303x: fix up the error handling
Applying: l3g4200d: change L3G4200D_FS_BIT value
Applying: sensor: board: Add U8520 & U9540 machine support

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-ste-multimedia-framework onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-ste-multimedia-framework

First, rewinding head to replay your work on top of it...
Applying: staging: Add STE mmio driver
Applying: mach-ux500: Add mmio device files and device
Applying: staging: nmf-cm: Add NMF/CM driver
Applying: staging: Add support in mmio driver for u5500
Applying: mach-ux500: Adding Support for U5500 Camera Board
Applying: ux500: mmio: Fix 2.6.38 ioctl porting
Applying: staging: nmf-cm: Update for api changes in 3.0
Applying: staging: mmio: Use local header file
Applying: staging: camera-flash: Add missing include file
Applying: mach-ux500: Fix for gpio header move
Applying: drivers:nmf-cm: Correct handling of CR register
Applying: staging: mmio: enable extended DDR usage
Applying: ARM: ux500: mmio: Correct disable mode gpio config
Applying: u5500: mmio: fix after move of mmio.h from include/linux to staging directory
Applying: Set Current Pid to Tid
Applying: u8500 CM: use vmalloc() for big allocations
Applying: U8500 CM: protect driver against MMDSP corruption
Applying: U8500 NMF-CM: rework the DMA part
Applying: U8500 NMF-CM: start DSP at 100 OPP
Applying: U8500 NMF-CM: make creation of domains more robust
Applying: U8500 NMF-CM: add support for component preloading
Applying: u5500: regulators: remove LDO S (VANA) control
Applying: U8500 NMF-CM: Increase internal fifo size
Applying: U8500 CM: make call to stopper synchronous
Applying: U8500 CM: provide MMDSP dump in case of Panic
Applying: U8500 CM: instantiate singleton in default domain
Applying: U8500 CM: Fix issue in component-preload mechanism
Applying: U8500 CM: execute services before detroying component
Applying: NMF CM Build Issue Fixed
Applying: mach-ux500: mmio: Enable Camera PMIC for S5500V2 Board
Applying: staging: camera_flash: Enable FLASH_MODE_NONE
Applying: ARM: ux500: miltimedia: Replace mach prcmu driver with mainlined version
Applying: ux500: mmio: update supply name
Applying: U8500 CM: fix 'make mrproper' issue
Applying: staging: nmf-cm: Fix after 3.1 rebase
Applying: ARM: ux500: mmio: Removes gpio_set_value warning
Applying: U8500 CM: send a DSP Panic if it's not responding
Applying: U8500 CM: always release the loadmap entry
Applying: U8500 CM: Add caller info in some panic
Applying: U8500 CM: remove useless files
Applying: U8500 CM: do not initialize ESRAM to zero
Applying: u5500: mmio: fix build failure
Applying: ux500: camera_flash: add platform data for adp1653
Applying: u8500: mmio: fix gpio_set_value warning
Applying: ARM: ux500: mmio: Corrects disable mode pin config
Applying: staging: add STE mmio driver compilation
Applying: staging: Add STE NMF/CM driver compilation
Applying: statging: Add STE camera flash driver compilation
Applying: include: Fix so the nmf-cm modules compiles
Applying: staging: nmf/cm: Fix dependency with STM trace driver
Applying: nmf-cm: Include module.h after 3.2 update
Applying: staging: mmio: protect shared resource using mutex
Applying: ux500: nmf cm: Manage the dma lcla in esram
Applying: U8500 CM: fix re-entrancy issue
Applying: staging: mmio: Corrects bug in buffer copy
Applying: U8500 CM: Add support to get DSP OST Trace on ARM
Applying: mmio: ux500: Coding style fixes
Applying: Revert "U8500 CM: Add support to get DSP OST Trace on ARM"
Applying: mmio: u5500: cleanup is_s5500_board()
Applying: U8500 CM: Add support to get DSP OST Trace on ARM
Applying: U8500 CM: Don't print corrupted data
Applying: U8500 CM: add read permission to others in debugfs
Applying: U8500 CM: Enable logging through ftrace
Applying: drivers: stagning: nmf-cm: Always assume db v2.0 or later
Applying: U8500 CM: fix crash when dumping domains info
Applying: nmf-cm: Declare bool module param in bool type
Applying: U8500 CM: fix issue when task doing DSP dump dies
Applying: Update mmio interfaces
Applying: Ux500 CM: wake-up DSP before doing any bindings
Applying: Ux500 CM: avoid ugly warning if kmalloc() fails
Applying: mmio: mach-ux500: Add support for 9540
Applying: mmio: ux500: Add U8520 machine
Applying: Ux500 CM: Exported cm_writeAttribute to user side
Applying: staging: mmio: use static buffer for i/o writes
Applying: Ux500 CM: Correct variable initialization
Applying: nmf/cm: Include missing <linux/device.h> for 3.4

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-storage-mmc onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-storage-mmc

First, rewinding head to replay your work on top of it...
Applying: Added commandline partitions for block devices
Applying: mach-ux500: Cumulative changes into board-*-sdi.c files
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (delete/modify): arch/arm/mach-ux500/board-u5500-sdi.c deleted in HEAD and modified in mach-ux500: Cumulative changes into board-*-sdi.c files. Version mach-ux500: Cumulative changes into board-*-sdi.c files of arch/arm/mach-ux500/board-u5500-sdi.c left in tree.
Failed to merge in the changes.
Patch failed at 0002 mach-ux500: Cumulative changes into board-*-sdi.c files

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-storage-mmc has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/board-u5500-sdi.c
#### Counting how many more conflicts there would have been
.......... - tracking-igloo_kernel-storage-mmc will fail 10 more times ####


Failed to auto-resolve
HEAD is now at 2f39567 mmci: the AMBA level regulator has been removed in 3.4

============================================================================================
Rebasing tracking-igloo_kernel-trace-debug onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-trace-debug

First, rewinding head to replay your work on top of it...
Applying: STM: MIPI System Trace Module char driver
Applying: trace: add STM trace hooks for printk, trace_printk, trace_function, stack trace and scheduler wakeup/context switch tracing
Applying: ARM: Make low-level printk work
Applying: arm: add printascii in printk option
Applying: ftrace: Increase number of named processes
Applying: stm: warning fix
Applying: ARM: ux500: hwreg debugfs: access DB8500 registers from debugfs entries
Applying: Boottime - A tool for automatic measurement of kernel and possible boot loader boot time.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/common/Makefile
Auto-merging init/Kconfig
Auto-merging init/Makefile
Auto-merging init/main.c
Applying: ARM: ux500: hwreg: Tiny code clean-up
Applying: printk: don't use CONFIG_DEBUG_LL
Applying: ARM: u8500: STM: board depended code split
Applying: misc: stm: Compile System Trace Module misc driver
Applying: mach-ux500: STM: break bad dependency with hsi
Applying: mach-ux500: stm: u8500: API for PRCMU_GPIOCR register
Applying: ARM: u8500: Add control for modem and ape trace
Applying: stm: Add include linux/types.h
Applying: hwreg: ux500: Coding style fixes
Applying: u8500 : misc : stm driver not functional
Applying: boottime: Port to new 3.3 cpustat interface
Applying: mach-ux500: hwreg adaptation for u9540
Applying: stm: mach-ux500: Add support for 9540
Applying: stm: ux500: Add U8520 machine
Applying: stm: mach-ux500: Update U8520 SD-card GPIO pins
Applying: init:boottime: Increase static entries

Rebase successful

============================================================================================
Rebasing tracking-igloo_kernel-usb onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-usb

First, rewinding head to replay your work on top of it...
Applying: usb: musb: ux500: add ux500 specific code for gadget side
Applying: usb: otg: ab8500-usb: workaround for connector id detection
Applying: usb: otg: ab8500-usb: let controller driver manage state
Applying: usb: otg: ab8500-usb: report vbus draw in the notifier call
Applying: Workaround for hardware problem in host mode for the MUSB chipset. Add missed TXPKTRDY check.
Applying: arm: ux500: common dbx500 prcmu driver api
Applying: musb: Update print for change in 3.0
Applying: USB:Dedicated charger connect issue on ABv3
Applying: USB:Software fix for usb eye diagram issue when drawing more than 100mA
Applying: USB:Enable GPIO configuration at connect
Applying: USB: Double Buffering
Applying: Generic:USB:Pairing suspend/resume correctly for musb
Applying: ux500: Removed USB support for AB8500 1.0 and 1.1
Applying: USB: Enable RNDIS
Applying: USB:Updating the documentation
Applying: musb:host: Linux Kernel3.0 host Integration
Applying: musb: host: unmap the buffer for PIO in EP0
Applying: ux500: usb: core: USB Hub support musb host
Applying: ux500: USB: Set the charging cur to 300mA for ABV3
Applying: ux500:USB:Boot time detection
Applying: U8500:USB:Fix for wrong handling of QOS
Applying: ux500: usb: Move request ARM OPP qos to usb driver
Applying: USB: Generating unique serial number for USB
Applying: musb: host: linux Kernel3.0 host dma disabled
Applying: ux500:USB:Generic USB GPIO frame work
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/mach-ux500/board-mop500.c
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
Auto-merging arch/arm/mach-ux500/board-ux500-usb.h
Failed to merge in the changes.
Patch failed at 0025 ux500:USB:Generic USB GPIO frame work

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-usb has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/board-mop500.c
#### Counting how many more conflicts there would have been
......................... - tracking-igloo_kernel-usb will fail 25 more times ####


Failed to auto-resolve
HEAD is now at 7e7c645 usb: core: Fix in ST-E changes after 3.4 porting

============================================================================================
Rebasing tracking-igloo_kernel-video onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-video

First, rewinding head to replay your work on top of it...
Applying: Porting architecture portion of av8100 driver from .35 to .38
Applying: Porting av8100 portion of video driver from .35 to .38
Applying: Porting mcde portion of the video driver from .35 to .38
Applying: Moving from ioctl to unlocked_ioctl in av8100
Applying: mcde: mach-ux500: boards merge from GLK 2.6.35
Applying: mcde: mach-ux500: u5500 alignment with 2.6.35
Applying: video: mcde: Fix Kconfig to match the ux500 update
Applying: video: mcde: Fix mcde GPIO and device creation
Applying: video: mcde: Fix for overlay handling
Applying: video: mcde: Fix memory allocation failure
Applying: video: av8100: Request inputclk only if inputclk_id is valid.
Applying: video: mcde: Correct behaviour for 720x480 resolution
Applying: drivers: video: add regulator for CVBS out
Applying: video: mcde: Add missing line for CVBS TV out
Applying: video: mcde: add support to change av8100 port
Applying: video: mcde: Fix field swap for CVBS by AV8100
Applying: Porting b2r2 portion of video driver from .35 to .38
Applying: Adding b2r2_blt_main.c to finish porting b2r2 portion of the video driver from .35 to .38
Applying: b2r2: Warnings fix
Applying: video: HWMEM Update API
Applying: ux500: mcde: Remove unused file
Applying: B2R2: Remove bluish tone when using yuv422i
Applying: video: HWMEM: Make user space include linux/types.h
Applying: video: mcde: Remove special SDTV watermark level
Applying: video: av8100: Fix occurences of test pattern
Applying: B2R2: Correct output for combined scale and rotation.
Applying: video: B2R2: Add support for YVU420/2_PACKED_(SEMI)_PLANAR.
Applying: video: mcde: Request dsi/dpi clocks only if needed
Applying: video: mcde: Enable esram34 only if needed
Applying: video: B2R2: Remove bluish tone when using yuv422i
Applying: video: mcde: Change overlay registers dynamically
Applying: video: mcde: Change handling of pix format
Applying: video: mcde: remove special interlaced porches
Applying: video: mcde: Add support for original NTSC
Applying: video: mcde: Fix irq_handler for chnl_disable
Applying: video: mcde: Fix first refresh when rotated
Applying: ux500: mcde: update board-configuration for U5500
Applying: video: mcde: update formatter setup for U5500
Applying: ux500: mcde: Increase DSI freq for U5500
Applying: video: mcde: Change fifo size to 640
Applying: video: av8100: Add support for DVI monitors
Applying: video: mcde: Correct issue when changing HDMI resolution
Applying: video: av8100: Add Alternative Powerup Sequence
Applying: video: mcde: fix SDTV through AB8500 flashes
Applying: ux500: mcde: Change rotbuf1/2 address for U5500
Applying: mcde: make sure all data is sent to display before next command
Applying: video: mcde_hdmi: Support for HDMI user space service
Applying: video: av8100: Add HDMI support for U5500
Applying: mach-ux500: framebuffer: Changes to be able to compile with u5500 and u8500 both enable
Applying: video: mcde: Add tripple buffer support
Applying: mcde: Fix after adding tripple buffer support
Applying: MCDE: Use fifo A for main display
Applying: video: av8100: Fix YUV port setting from startup
Applying: video: mcde: Change color convert offset fields
Applying: video: av8100: Fix colors for HDMI with a YUV port
Applying: video: av8100: Request DDR OPP
Applying: video: av8100: Filter plug event
Applying: video: av8100: Change HW response timeout values
Applying: video: mcde: Fix chnl_disable for U5500
Applying: video: mcde: Add mutex in dss
Applying: video: av8100: Control interrupts at power change
Applying: video: av8100: Add HDMI resolutions
Applying: mcde: fix build error with !EARLY_SUSPEND
Applying: video: mcde: Add dss overlay info
Applying: video: hdmi: Fix wrong return status
Applying: arm: ux500: Correct FB height when triple buffer
Applying: video: mcde: improve display configuration
Applying: video: mcde: Support YUV 422 overlay pixel format
Applying: arm: ux500: common dbx500 prcmu driver api
Applying: ux500: mcde: Use 24 bpp overlay for HDMI
Applying: video: av8100: Improve plug detection
Applying: video: mcde: Log error interrupts as debug support
Applying: video: av8100: Add suspend resume
Applying: video: mcde: fix build problems with update
Applying: video: mcde: add support for generic write commands
Applying: video: av8100: Correct hdmi display id
Applying: video: hdmi: Correct hdcp acc to documentation
Applying: av8100: Big kernel lock removed in 3.0
Applying: b2r2: Correct support for 24/32bit (A)YUV(8)888
Applying: video: mcde: Add Fictive display
Applying: video: mcde: DSI link wait for csm_running
Applying: video: mcde: Add fake color map functionality
Applying: Moving default pixel format from RGB888 to RGB565.
Applying: video: mcde: Add console semaphore
Applying: video: mcde: Allow HDMI to stay alive
Applying: ux500: regulators: update
Applying: mcde:Migrate the patches for kernel3.0
Applying: b2r2:Migrate driver to kernel 3.0
Applying: av8100:Migration to kernel 3.0 patch
Applying: mcde: mach-ux500: Migrate the patches for kernel3.0
Applying: video: mcde: Add sony display support for DB5500
Applying: video: HDMI: HDMI support for v2 board for DB5500
Applying: misc: dispdev: Migrate to kernel 3.0
Applying: misc: dispdev: Migrate to kernel 3.0
Applying: mcde: u5500: Migrate to kernel3.0
Applying: mach-ux500:mcde:Kernel 3.0 migration
Applying: mach-ux500:hdmi:Kernel 3.0 migration
Applying: hdmi: dispdev: Kernel 3.0 migration changes
Applying: mcde:Migrate the patches to kernel 3.0
Applying: hdmi: Kernel 3.0 migration changes
Applying: b2r2: Kernel 3.0 migration changes
Applying: mach-ux500: mcde: Check cpu instead of machine
Applying: video: mcde: lcdtim1 not properly set
Applying: misc: dispdev: Fix for display update
Applying: video: mcde: remove PDP config
Applying: video: mcde: correct DSI command set max pkt size
Applying: video: av8100: Add new firmware version
Applying: b2r2:Add optimized path for VUY(A)888(8) 24/32-bit
Applying: mach-ux500:u5500:MCDE platform data for kernel 3.0
Applying: mach-ux500: video: Platform data for kernel 3.0
Applying: video: mcde: request irq after init_waitqueue
Applying: video: mcde: Match DSI pkt_size to display width
Applying: video: mcde: use external TE0 for display vsync
Applying: video:mcde:Modified gpio set call to reset MCDE
Applying: video:hdmi:Modified gpio set call to reset
Applying: video: mcde: Change to mdelay
Applying: video: hdmi: Change data type
Applying: video: mcde: Fix probe of sub display
Applying: Dispdev: Removed the UNINIT error
Applying: video: mcde: Correct DSI startup sequence
Applying: arm: ux500: video: Configure dsi clocks and regulators
Applying: video: mcde: Add channel states
Applying: video: mcde: fix pixelwatermarklevel
Applying: video: mcde: Change timing for DPI formatter
Applying: ARM: ux500: video: Replace mach prcmu driver with mainlined version
Applying: ux500: mcde: use constant device ids
Applying: ux500: mcde: update supply names
Applying: video: hdmi: Fix fb creation failure
Applying: mach-ux500: mcde: Add prefix to mcde board func
Applying: u5500: mcde: Fix build errors
Applying: mcde: Disable power down for normal blanking.
Applying: mcde: Add implementation for colreg and cmap.
Applying: av8100: Add av8100 firmware to kernel firmware.
Applying: ux500: mcde: Dont probe for uib on snowball
Applying: ux500: mcde: Remove unnessesary delay for av8100
Applying: video: mcde: Add fps logging
Applying: video: av8100: Debug new chip version
Applying: video: av8100: Fix wrong loop max value
Applying: video: av8100: Improve error handling
Applying: arm: ux500: fix compilation errors
Applying: video: av8100: Change color convert rgb->denc
Applying: video: mcde: Fix fps logging
Applying: ux500: mcde: Add UIB8500R3 display support
Applying: video: mcde: Remove prepare for update
Applying: video: mcde: Add generic suspend/resume for MCDE bus
Applying: video: mcde: Add Samsung S6D16D0 driver
Applying: video: mcde: Add generic DSI platform data
Applying: ux500: mcde: Replace generic driver with Samsung
Applying: video: mcde: Handle ACKNOWLEDGE_WITH_ERR in read
Applying: video: mcde: get_pkt_div should use port mode
Applying: video: mcde: Fix suspend oops in Android
Applying: ux500: mcde: Add correct reg id for sony display
Applying: video: mcde: Move driver data to sony display
Applying: ux500: mcde: Remove sony display data from board
Applying: video: mcde: Remove sony display platform data
Applying: ux500: mcde: Remove unused code
Applying: ux500: mcde: Remove unused MCDE auto sync
Applying: video: mcde: Remove unused MCDE auto sync
Applying: misc: Add dispev driver compilation
Applying: mach-ux500: Include mach-ux500 Display specifics config flags
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging arch/arm/mach-ux500/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/Kconfig
Failed to merge in the changes.
Patch failed at 0160 mach-ux500: Include mach-ux500 Display specifics config flags

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".


Rebase failed - attempting to automatically resolve - tracking-igloo_kernel-video has 1 conflicts


Unknown conflicts were encountered which require human intervention - aborting rebase

Outstanding conflicts:
	arch/arm/mach-ux500/Kconfig
#### Counting how many more conflicts there would have been
 - tracking-igloo_kernel-video will fail 0 more times ####


Failed to auto-resolve
HEAD is now at 98394ba Revert "ux500: mcde: Remove unnecessary MCDE fbdev update"

============================================================================================
Rebasing tracking-igloo_kernel-wlan onto mainline/master - 3166 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-igloo_kernel-wlan

First, rewinding head to replay your work on top of it...
Applying: WLAN: Initial commit of the STM CW1200 WLAN driver.
Applying: WLAN: CW1200: Support for GPIO-based IRQ.
Applying: WLAN: CW1200: Power management is implemnted.
Applying: WLAN: CW1200: Support for HREF/HREFV60/Snowball.
Applying: WLAN: CW1200: Fix for a crash in cfg80211_get_drvinfo() on ifconfig.
Applying: WLAN: CW1200: HT: ampdu_action is implemented.
Applying: cw1200: Set up max_scan_ie_len
Applying: cw1200: Workaround against a bug in Code Sourcery arm2010q1.
Applying: cw1200: Workaround against a problem with DMA on ux500 platform.
Applying: cw1200: Integration with mach-ux500
Applying: cw1200: Spin lock usage review.
Applying: wlan: cw1200: .flush mac80211 API is implemented.
Applying: wlan: cw1200: Reenable filtering.
Applying: cw1200: Request SDIO pins at device registration.
Applying: wlan: cw1200: Add cut2.2 support
Applying: cw1200: listening mode implementation
Applying: cw1200: Align TX buffers for DMA.
Applying: cw1200: Add regulator support
Applying: ux500: irq: wlan: Fix multi boards support & put board common parts to mach/irqs.h
Applying: cw1200: Expose driver internals on DebugFS.
Applying: cw1200: throughput optimization.
Applying: cw1200: fix for locked datapath after deauth.
Applying: cw1200: Support of WSM293+ firmware in STA mode.
Applying: cw1200: AMSDU debug statistics
Applying: cw1200: Multi-tx confirmation is implemented.
Applying: cw1200: stylistic change: move RX callback to txrx.c
Applying: cw1200: 11n verification and bugfixing.
Applying: cw1200: New option for 5GHz support.
Applying: cw1200: Document and optimize device reset sequence.
Applying: cw1200: rate policy optimization.
Applying: cw1200: Remove link to platform_device from platform_data.
Applying: cw1200: throughput optimization and fine-tuning.
Applying: WLAN: Add cw1200_plat.h to mach-ux500 includes
Applying: u8500: Update board-mop500-wlan
Applying: WLAN: remove GPIO_IRQ conditional checks
Applying: WLAN: u5500: Add wlan init to u5500 board file
Applying: WLAN: u5500: Add new wlan platform file for u5500
Applying: mach-ux500: wlan: Add prefix to wlan board func
Applying: cw1200: API change for ieee80211_channel_to_frequency
Applying: cw1200: Fix wrongly reported band.
Applying: cw1200: enabling WAPI support
Applying: cw1200: Remove unnecessary delays in cw1200_sdio_on.
Applying: cw1200: Document and optimize device reset sequence.
Applying: cw1200: Dynamic power save is offloaded to the firmware.
Applying: cw1200: Syncing WSM API usage with firmware team.
Applying: cw1200: Aligning mac80211 API with compat-wireless-3.0-rc4-1
Applying: cw1200: Driver should not report MCS rates to mac80211.
Applying: cw1200: Multicast filtering support.
Applying: cw1200: Removed obsolete code (software keepalive).
Applying: cw1200: Wakeup on wireless (WoW) is implemented.
Applying: cw1200: Fix for firmware exception on requeued TXed frames.
Applying: cw1200: ARP ipv4 filtering
Applying: cw1200: Cancel connection and beacon loss works
Applying: cw1200: Fix for buffered multicasts in AP-PS mode.
Applying: cw1200: Off-channel sending of action frames is implemented.
Applying: cw1200: Support for non-Greenfield STA protection
Applying: cw1200: Support for limited wowlan functionalities
Applying: cw1200: Fix for buffered multicasts in AP-PS mode: bugfix.
Applying: cw1200: Workaround against cyclic requeue of multicast frames.
Applying: cw1200: Removing obsolete code which blocked power management by default.
Applying: cw1200: Remove some spam from logging.
Applying: cw1200: Minor fixes.
Applying: cw1200: Fix for a crash in cw1200_join_work.
Applying: cw1200: Fix for driver hang at join timeout (scan in progress)
Applying: cw1200: Allow proberesponse frame to be txed
Applying: cw1200: P2P power save support
Applying: cw1200: Do join if upper layer is trying to TX in monitor mode.
Applying: cw1200: Missing interrupt detection.
Applying: cw1200: Allow TXing in monitor mode
Applying: cw1200: Syncing join status by wsm_tx_lock().
Applying: cw1200: PSPOLL is supported.
Applying: cw1200: Cancel suspend on late interrupts.
Applying: cw1200: Print firmware exception information.
Applying: cw1200: Add changes for UAPSD
Applying: cw1200: Fix for firmware crash/hang in SoftAP with powersave.
Applying: cw1200: do not allow suspend when it is useless.
Applying: cw1200: Fix for a BUG in cw1200_unjoin_work.
Applying: cw1200: Fix incorrect usage of wait_event_interruptible_timeout.
Applying: cw1200: Fix: .remove callback for cw1200_power_driver
Applying: cw1200: Disable U-APSD support
Applying: cw1200: Fix release callback for PM device
Applying: cw1200: Force unjoin on scan if association is not completed.
Applying: cw1200: PM state in AP mode could be out of sync.
Applying: cw1200: Check p2p flag for wsm join and start.
Applying: cw1200: Don't allow scan when in MiniAP mode
Applying: cw1200: Re-enable U-APSD support in driver
Applying: cw1200: Enable quiescent mode.
Applying: cw1200: Remove confusing warnings
Applying: cw1200: Enable Block ACK Policy.
Applying: cw1200: cancel pending timer in cw1200_stop
Applying: cw1200: Kernel 3.0 adaptations
Applying: cw1200: configure_filter callback must be serialized with scan.
Applying: cw1200: Add BT Coexistence support
Applying: cw1200: UAPSD in AP mode is implemented.
Applying: cw1200: Adaptation to U-APSD/AP support as on Thu, Sep 22, 2011
Applying: cw1200: Switch device to low power at suspend.
Applying: cw1200: improve ap mode startup
Applying: cw1200: Fix for potential crash on driver unloading.
Applying: cw1200: cw1200_flush() blocked execution on SoftAP stop
Applying: cw1200: Remove WARN_ON on possible execution path
Applying: cw1200: Fix for incorrect retry statistics reporting.
Applying: cw1200: New debugfs entry for firmware counters
Applying: cw1200: New debugfs entry for 11n support
Applying: cw1200: cw1200_sta_notify implementation was removed by mistake.
Applying: cw1200: queue dependency refactoring.
Applying: cw1200: AP PS refactoring.
Applying: cw1200: Accurate reporting of TX status.
Applying: cw1200: Fix checkpatch warnings.
Applying: cw1200: Syncing ALK and GLK tracks.
Applying: cw1200: Requeue special frames.
Applying: cw1200: Switch channel sync
Applying: cw1200: Fixing corrupted direct probe requests.
Applying: u8500: Adding clock control callback into platform data.
Applying: cw1200: Enable clock at startup.
Applying: cw1200: Re add snowball support
Applying: ux500: enable WLAN clock by request
Applying: cw1200: Fix for WPA2 security not working
Applying: cw1200: Fix destroy of undefined eeprom_mutex
Applying: staging: Add STM CW1200 WLAN driver compilation
Applying: wlan: Include module.h after 3.2 update
Applying: cw1200: Fix API change introduced in 3.2
Applying: [U9500] Correct the GPIO configuration for WLAN
Applying: WLAN: Update Kconfig for CW1200
Applying: u5500: cw1200: Remove requesting SDIO pins
Applying: u5500: WLAN: Adds prcmu_ctrl callback
Applying: cw1200: Disable BSSID filtering in monitor mode.
Applying: cw1200: scan, probe_req rates check no_cck flag
Applying: cw1200: Update license information
Applying: cw1200: Remove unnecessary condition in scan function
Applying: cw1200: Set better block size for SDIO
Applying: cw1200: Remove unnecessary reads of CONTROL reg
Applying: cw1200: Retry sdio read/write in case of error
Applying: cw1200: Enable probe_req forwarding
Applying: cw1200: Add 2byte hole in TXreq for unaligned buf
Applying: cw1200: Fix pointer cast in cw1200_tx_h_align
Applying: cw1200: Change kalloc parameter to GFP_ATOMIC
Applying: cw1200: reset firmware after deauthentication.
Applying: cw1200: fix WMM AC parameters forwarding to WSM.
Applying: cw1200: Force background scan
Applying: cw1200: Disable AP-keep-alive before reset
Applying: cw1200: Set PM mode only if we are associated
Applying: cw1200: Synchronize PS and scan requestes
Applying: cw1200: Do not send BSS params if we are not associated
Applying: cw1200: Enable IEEE802.11 PS for P2P
Applying: cw1200: Enable Block ACK only for 11n BSS.
Applying: cw1200: Add option to disable 11d beacon hints.
Applying: cw1200: Unitialized spinlocks.
Applying: cw1200: Stay awake when DEAUTH frame is received.
Applying: cw1200: Do not set ListenInterval for BeaconWakeUpPeriod MIB.
Applying: cw1200: Fix potential SMP synchonization issues
Applying: cw1200: Add workaround for WFD test case 6.1.10
Applying: cw1200: block consecutive calls to wsm_set_pm
Applying: cw1200: Fix for MIC failure - strip ICV
Applying: cw1200: TX burst forming.
Applying: cw1200: Dynamic TX queue prioritization.
Applying: cw1200: Drop frames from locked queue.
Applying: cw1200: Fix for unbalanced tx_lock/unlock in TX policy uploading
Applying: cw1200: fix for wrong order of lock operations in cw1200_config
Applying: cw1200: remove blocking call to cw1200_cancel_scan()
Applying: cw1200: Stay awake if join request sent to FW
Applying: cw1200: temporary disable beacon filtering on join
Applying: cw1200: Adds suspend/resume SDIO callbacks
Applying: cw1200: fix initial rate settings for inverted ratesets.
Applying: cw1200: Send null frame after bss lost event.
Applying: cw1200: Added handling Protected Mgmt Policy
Applying: cw1200: Adds 4byte alignment for 16bit read/writes
Applying: cw1200: Remove use of mmc_host_enable|disable for sdio
Applying: cw1200: enable non-ERP protection.
Applying: cw1200: Refactor workaround for WFD 6.1.10
Applying: cw1200: Enable beacon skipping.
Applying: cw1200: Change WARN_ON to WARN_ON_ONCE
Applying: cw1200: Make use of KEEP_POWER
Applying: cw1200: Enable block ACK in RX direction.
Applying: cw1200: Block consecurive calls to the wsm_configuration
Applying: cw1200: Fixed unregistering order in cw1200_unregister_common
Applying: cw1200: Always update template on scan request.
Applying: cw1200: Add RCU protection for ieee80211_sta
Applying: cw1200: Fixes for multicast delivery in AP/UAPSD mode.
Applying: cw1200: Fixes possible corruption in list handling
Applying: cw1200: Change behavior on Action frame RX.
Applying: cw1200: Deprioritize background queue.
Applying: cw1200: Fix power consumption in STA mode
Applying: cw1200: Adds wlan on u5500 support
Applying: cw1200: limits maximum beacon skip period.
Applying: cw1200: Correctly handle requeuing for NOA.
Applying: cw1200: Set p2p mode info in p2p STA and GO modes.
Applying: cw1200: Workaround against throughput drop in b/g mixed mode.
Applying: cw1200: set barker_mode and non-ERP_present bits.
Applying: cw1200: AP/GO UAPSD force STA PS minor update
Applying: cw1200: fix scan timeout issues
Applying: cw1200: Send NOA notification after NOA set
Applying: cw1200: fix deadlock on priv->ps_state_lock.
Applying: cw1200: fix crash during driver unloading.
Applying: cw1200: fix ps_state_lock locking
Applying: cw1200: Driver hung detection and reporting
Applying: cw1200: Dynamic BA.
Applying: cw1200: Fix disabling BlockAck on scan.
Applying: cw1200: Fix compiler warnings
Applying: cw1200: Enable REPORTS_TX_ACK_STATUS HW CAP bit.
Applying: cw1200: Bypass BSS loss confirmation in P2P mode
Applying: cw1200: Set empty probe response template
Applying: cw1200: Add Operational Mode setting.
Applying: cw1200: Skip packets with Rssi equal to zero.
Applying: cw1200: ITP
Applying: cw1200: Fix missing debug parts of ITP implementation
Applying: cw1200: fix queue locking
Applying: cw1200: Makes the FW report RCPI instead of RSSI
Applying: cw1200: Do not set bssid filter when in p2p mode
Applying: cw1200: Handle WSM_EVENT_RCPI_RSSI correctly
Applying: cw1200: Start advanced filtering on system suspend
Applying: cw1200: Removes unnecessary WARN_ON.
Applying: cw1200: Fixing checkpatch warnings.
Applying: cw1200: Dynamic WSM messages dumps
Applying: cw1200: WSM debug improvements
Applying: cw1200: Fix for false negatives in suspend decision.
Applying: cw1200: Do not allow device to suspend when it is not fully awake.
Applying: cw1200: Avoid sleeping on TX lock for more than 1.5 sec.
Applying: cw1200: Balance calls to cw1200_pm_(de)init.
Applying: cw1200: Detect "stuck" TX frames at early stage.
Applying: wlan: mach-ux500: Add support for 9540
Applying: wlan: ux500: Add U8520 machine
Applying: cw1200: wakelock: Change for new Google wakelock implementation over PM sleep
Applying: cw1200: Fix after interface change in mac80211 for 3.4
Applying: cw1200: Manage parent device during initialization

Rebase successful

============================================================================================
Rebasing tracking-mainline-master onto mainline/master - 0 commits
============================================================================================

Moving to temporary rebasing branch - rebasing-mainline-master

Current branch rebasing-mainline-master is up to date.

Rebase successful

Rebase complete:
	11 failed rebase(s) - please rebase these individually
		tracking-igloo_kernel-audio
		tracking-igloo_kernel-caif
		tracking-igloo_kernel-core
		tracking-igloo_kernel-gpio
		tracking-igloo_kernel-hsi
		tracking-igloo_kernel-mach-plat
		tracking-igloo_kernel-modem
		tracking-igloo_kernel-pm
		tracking-igloo_kernel-storage-mmc
		tracking-igloo_kernel-usb
		tracking-igloo_kernel-video
	13 successful rebase(s)
		tracking-igloo_kernel-cg2900
		tracking-igloo_kernel-cg2900-fm
		tracking-igloo_kernel-dma
		tracking-igloo_kernel-hwmem
		tracking-igloo_kernel-input
		tracking-igloo_kernel-mali
		tracking-igloo_kernel-other
		tracking-igloo_kernel-security
		tracking-igloo_kernel-st-mems-sensors
		tracking-igloo_kernel-ste-multimedia-framework
		tracking-igloo_kernel-trace-debug
		tracking-igloo_kernel-wlan
		tracking-mainline-master

More information about the Igloo-logs mailing list