Changes in cayman

e5451c8f8330e03ad3cfa16048b4daf961af434f - Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochip

Tue, 23 Feb 2016 14:07:08 +0000

Merge remote-tracking branch 'linusw-gpio/for-next' into devm_gpiochipBase for demv_gpiochip_add_data() and devm_gpiochip_remove(). List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

b7d3622a39fde7658170b7f3cf6c6889bb8db30d - Merge tag 'v3.13' into for-3.15

Fri, 07 Mar 2014 16:41:32 +0000

Merge tag 'v3.13' into for-3.15Linux 3.13Conflicts: include/net/xfrm.hSimple merge where v3.13 removed 'extern' from definitions and the audittree did s/u32/unsigned int/ to the same definitions. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

825e587af2e90e9b953849f3347a01d8f383d577 - Merge tag 'v3.13' into stable-3.14

Tue, 28 Jan 2014 19:44:16 +0000

Merge tag 'v3.13' into stable-3.14Linux 3.13Conflicts: security/selinux/hooks.cTrivial merge issue in selinux_inet_conn_request() likely due to meincluding patches that I sent to the stable folks in my next treeresulting in the patch hitting twice (I think). Thankfully it was aneasy fix this time, but regardless, lesson learned, I will not do thatagain. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

6ceb339109adf88a27b6f596c9f99a095f762659 - Merge remote-tracking branch 'wireless-next/master' into ath-next

Tue, 04 Feb 2014 16:29:45 +0000

Merge remote-tracking branch 'wireless-next/master' into ath-next List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

c29b8f3149f2916e98fc3b8d6c1df2137d003979 - Merge tag 'v3.14-rc1' into patchwork

Mon, 03 Feb 2014 17:32:45 +0000

Merge tag 'v3.14-rc1' into patchworkLinus 3.14-rc1* tag 'v3.14-rc1': (11781 commits) Linus 3.14-rc1 hpfs: optimize quad buffer loading hpfs: remember free space parisc: add flexible mmap memory layout support parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc parisc: convert uapi/asm/stat.h to use native types only parisc: wire up sched_setattr and sched_getattr parisc: fix cache-flushing parisc/sti_console: prefer Linux fonts over built-in ROM fonts hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors tools/power turbostat: introduce -s to dump counters tools/power turbostat: remove unused command line option afs: proc cells and rootcell are writeable tile: remove compat_sys_lookup_dcookie declaration to fix compile error Revert "PCI: Remove from bus_list and release resources in pci_release_dev()" ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA ARM: multi_v7_defconfig: add mvebu drivers clocksource: kona: Add basic use of external clock drivers: bus: fix CCI driver kcalloc call parameters swap ... List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

41be702a542a0d14bb0b1c16e824fa9ed27616ec - Merge tag 'v3.13' into next

Thu, 23 Jan 2014 20:52:06 +0000

Merge tag 'v3.13' into nextLinux 3.13Minor fixup needed in selinux_inet_conn_request()Conflicts: security/selinux/hooks.c List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

55df811f2066fcaec2548248f0a1a6a0c12dc6b8 - Merge branch 'next' into for-linus

Thu, 23 Jan 2014 16:10:44 +0000

Merge branch 'next' into for-linusFirst round of input updates for 3.14. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

62813858fb5d1fb661433d7884668aa111115a35 - Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus

Wed, 22 Jan 2014 14:40:14 +0000

Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub', 'for-3.14/sony' and 'for-3.14/upstream' into for-linus List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

935b0d622f16538d071af823388c21c2e6f66134 - Merge tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351 into next/dt

Wed, 22 Jan 2014 00:55:05 +0000

Merge tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351 into next/dtFrom Christian Daudt:Add i2c, usb and clock DT configuration to bcm mobile.* tag 'bcm-for-3.14-dt' of git://github.com/broadcom/bcm11351: (697 commits) clk: bcm281xx: define kona clock binding ARM: dts: add usb udc support to bcm281xx ARM: dts: Specify clocks for timer on bcm11351 Documentation: dt: kona-timer: Add clocks property ARM: dts: Specify clocks for SDHCIs on bcm11351 Documentation: dt: kona-sdhci: Add clocks property ARM: dts: Specify clocks for UARTs on bcm11351 ARM: dts: bcm281xx: Add i2c busses ARM: dts: Declare clocks as fixed on bcm11351 ARM: dts: bcm28155-ap: Enable all the i2c busses +Linux 3.13-rc5 ...Signed-off-by: Kevin Hilman List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

361128fcbf30f590a05c8e8789155364f37367db - Merge remote-tracking branch 'grant/devicetree/next' into for-3.14

Fri, 17 Jan 2014 22:01:27 +0000

Merge remote-tracking branch 'grant/devicetree/next' into for-3.14 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

81e53d0470878165a300d75ac06a5bc5eee543a2 - Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw

Fri, 17 Jan 2014 15:52:17 +0000

Merge branches 'topic/sc18is602' and 'topic/rspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-bpw List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

0d9d349d8788d30f3fc3bb39279c370f94d9dbec - Merge commit origin/master into drm-intel-next

Thu, 16 Jan 2014 21:06:30 +0000

Merge commit origin/master into drm-intel-nextConflicts are getting out of hand, and now we have to shuffle evenmore in -next which was also shuffled in -fixes (the call fordrm_mode_config_reset needs to move yet again).So do a proper backmerge. I wanted to wait with this for the 3.13relaese, but alas let's just do this now.Conflicts: drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_pm.cBesides the conflict around the forcewake get/put (where we chaged thecalled function in -fixes and added a new parameter in -next) code allthe current conflicts are of the adjacent lines changed type.Signed-off-by: Daniel Vetter List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

598911b42c940158caa1169092a804903bde845e - Merge tag 'v3.13-rc4' into regulator-pfuze100

Wed, 15 Jan 2014 11:46:35 +0000

Merge tag 'v3.13-rc4' into regulator-pfuze100Linux 3.13-rc4 List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

13ea3300100ec3461560b1e061033cd167333a86 - Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi

Tue, 14 Jan 2014 14:14:47 +0000

Merge branch 'topic/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-rspi List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

dba861461f88c12249ac78fb877866c04f99deb3 - Merge branch 'linus' into timers/core

Sun, 12 Jan 2014 13:12:44 +0000

Merge branch 'linus' into timers/corePick up the latest fixes and refresh the branch.Signed-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

54a387cb9e600256e50cb9e2209e7e4f06f464de - Merge branch 'for-3.14/core' into for-3.14/drivers

Wed, 08 Jan 2014 16:32:45 +0000

Merge branch 'for-3.14/core' into for-3.14/driversWe need the updated code to make bcache easier to merge. List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

38fd2c202a3d82bc12430bce5789fa2c2a406f71 - Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM

Mon, 06 Jan 2014 11:23:01 +0000

Merge to v3.13-rc7 for prerequisite changes in the Xen code for TPM List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

ef0b8b9a521c65201bfca9747ee1bf374296133c - Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

Sun, 05 Jan 2014 11:34:29 +0000

Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflictsConflicts: arch/x86/platform/efi/efi.c drivers/firmware/efi/KconfigSigned-off-by: Ingo Molnar List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

4b5a5096bb834102b2e821f5f34274f041862d67 - Merge branch 'for-linus' into for-next

Sun, 05 Jan 2014 10:19:34 +0000

Merge branch 'for-linus' into for-next List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman

a7dedb4fead89f88255862a9bc46f4c7ec094c2e - Merge tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers

Thu, 02 Jan 2014 19:45:27 +0000

Merge tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/driversFrom Sekhar Nori:DaVinci GPIO driver updates---------------------------This pull request contains updates to DaVinci GPIO driver and theresultant platform code changes. The updates include DT-conversion andchanges to make the driver cross-platform ready.* tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: gpio: davinci: don't create irq_domain in case of unbanked irqs gpio: davinci: use chained_irq_enter/chained_irq_exit API gpio: davinci: add OF support gpio: davinci: remove unused variable intc_irq_num gpio: davinci: convert to use irqdomain support. gpio: introduce GPIO_DAVINCI kconfig option gpio: davinci: get rid of DAVINCI_N_GPIO gpio: davinci: use {readl|writel}_relaxed() instead of __raw_*Signed-off-by: Olof Johansson List of files: /linux/drivers/gpu/drm/radeon/reg_srcs/cayman