Re: git repo and #upstream merging

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Tejun Heo wrote:
Tejun Heo wrote:
This is the second take of improve-ACPI-corner-case-handling patchset
and contains the following ten patches.

Jeff, this patchset can also be pulled from the following git tree.

  master.kernel.org:/pub/scm/linux/kernel/git/tj/libata-dev.git acpi-fixes

Also, merging this into #upstream can cause some interesting conflicts
w/ ACPI timing handling update patches.  If you ACK the patchset, I'll
prep merged git HEAD for you.

It was easier for me to

* merge the patches into #upstream-fixes

* rebase #upstream on top of #upstream-fixes,
	while dropping the conflicting ACPI patches

And IMO that gives you a bit more freedom to do the merged git -- though that obviously implies you will need to resend the ACPI patchset that you had previously submitted.

	Jeff



-
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Filesystems]     [Linux SCSI]     [Linux RAID]     [Git]     [Kernel Newbies]     [Linux Newbie]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Samba]     [Device Mapper]

  Powered by Linux