linux-next: manual merge of the block tree with the ext3 tree
Hi Jens, Today's linux-next merge of the block tree got a conflict in fs/ext3/fsync.c between commit a74302d5d82ff478822c49b8345312b6fd5c6e0a ("ext3: Fix waiting on transaction during fsync") from the ext3 tree and commit fbd9b09a177a481eda256447c881f014f29034fe ("blkdev: generalize flags for blkdev_issue_fn fun... 30 Apr 2010 13:59
linux-next: manual merge of the usb tree with the sound tree
On Fri, Apr 30, 2010 at 03:51:34PM +1000, Stephen Rothwell wrote: Today's linux-next merge of the usb tree got a conflict in sound/usb/usbaudio.c between commit e5779998bf8b70e48a6cc208c8b61b33bd6117ea ("ALSA: usb-audio: refactor code") from the sound tree and commit 3cc96f50329227fbf34de2459491901b6ee1c... 30 Apr 2010 13:59
eeprom_93cx6: Add data direction control.
Hi Ben, On Fri, 30 Apr 2010 00:16:24 +0100, Ben Dooks wrote: Some devices need to know if the data is to be output or read, so add a data direction into the eeprom structure to tell the driver whether the data line should be driven. The user in this case is the Micrel KS8851 which has a direction ... 30 Apr 2010 13:59
of/gpio: Implement GPIOLIB notifier hooks
On Fri, Mar 12, 2010 at 02:38:02PM -0700, Grant Likely wrote: [...] How to proceed: I'd like to leave this series out for the 2.6.34 cycle and I'll pick it into my OF tree before the 2.6.35 merge window, but I'll probably modify it to call the OF hooks directly and leave out the unnecessary notifier infra... 30 Apr 2010 13:59
regulator: small fixes and cleanup
On Thu, 2010-04-29 at 10:55 +0300, Jani Nikula wrote: Hi - Here's a few small fixes to problems I think I found in the regulator framework. Please give them some thought; I don't know the area very well. BR, Jani. Jani Nikula (3): regulator: prevent registration of matching regula... 30 Apr 2010 15:08
Staging: sm7xx: Fixed coding style issues.
On Sun, Mar 28, 2010 at 04:31:15PM +1100, Kenji Toyama wrote: Lots of tabs before spaces and some other minor issues. Signed-off-by: Daniel Kenji Toyama <kenji.toyama(a)> --- drivers/staging/sm7xx/smtcfb.c | 16 ++++++++-------- Sorry, but someone else already made this same change :( greg k-... 30 Apr 2010 13:59
2.6.34-rc5-git10: oops on Atom N270/ i945GSE upon shutdown with X86_MRST && APB_TIMER enabled
Hi While testing kernel 2.6.34-rc5-git10 on an Acer Aspire One 110L netbook (Atom N270, i945GSE chipset, hyperthreading enabled and not configurable, BIOS 3309), I reproducably encounter the following oops while shutting down (manual transcription below): Pid: 2253, comm: halt Not Tainted 2.6.34-rc5-sidux-68... 30 Apr 2010 13:59
[GIT PULL] perf: Initial regression testing command
From: Arnaldo Carvalho de Melo <acme(a)> Hi Ingo, Please consider pulling from: git:// perf Now there are 7 patches in that repo. Regards, - Arnaldo Arnaldo Carvalho de Melo (2): perf symbols: Add machine helper routines perf tes... 30 Apr 2010 13:59
[GIT PULL] lockdep updates
Ingo, Please pull the core/locking branch that can be found at: git:// core/locking Note there is also a merge of v2.6.34-rc6 because these patches depend on older per cpu updates. Thanks, Frederic --- Frederic Weisbecker (2): ... 30 Apr 2010 13:59
linux-next: manual merge of the bkl-ioctl tree with the bkl-procfs tree
Hi Frédéric, Today's linux-next merge of the bkl-ioctl tree got a conflict in drivers/isdn/divert/divert_procfs.c between commit 64ef834551d7696f54553d7608eba80a5a800e77 ("procfs: Push down the bkl from ioctl") from the bkl-procfs tree and commit 5cc2443e44f810a21d1228ac9bf60b41536e5b9c ("isdn: Push down BKL i... 30 Apr 2010 13:59